From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

---
 src/main/java/com/zy/asrs/entity/WrkMastSta.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index de673a8..14a021d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -125,11 +125,11 @@
 
     @ApiModelProperty(value= "")
     @TableField("matnr1")
-    private Integer matnr1;
+    private String matnr1;
 
     @ApiModelProperty(value= "")
     @TableField("matnr2")
-    private Integer matnr2;
+    private String matnr2;
 
     @ApiModelProperty(value= "")
     @TableField("type2")

--
Gitblit v1.9.1