From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 3978f0c..46c25f4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -43,19 +43,19 @@
     /**
      * 鍚嶇О
      */
-    @ApiModelProperty(value= "鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String name;
 
     /**
      * 缂栫爜
      */
-    @ApiModelProperty(value= "缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡缂栫爜")
     private String code;
 
     /**
      * 璐т富ID
      */
-    @ApiModelProperty(value= "璐т富ID")
+    @ApiModelProperty(value= "璐т富鏍囪瘑")
     private Long shipperId;
 
 //    @ApiModelProperty(value = "璐т富缂栫爜")
@@ -64,7 +64,7 @@
     /**
      * 鍒嗙粍ID(*)
      */
-    @ApiModelProperty(value= "鍒嗙粍ID(*)")
+    @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
     private Long groupId;
 
     /**
@@ -82,7 +82,7 @@
     /**
      * 瑙勫垯浠g爜
      */
-    @ApiModelProperty(value= "瑙勫垯浠g爜")
+    @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
     private Long rglarId;
 
     /**
@@ -118,7 +118,7 @@
     /**
      * 闀�*瀹�*楂�(m)
      */
-    @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+    @ApiModelProperty(value= "灏哄(m)")
     private String size;
 
     /**

--
Gitblit v1.9.1