From ee4643ab09a85661532fd75ddb45a1b44e92f530 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 16 五月 2023 09:37:18 +0800
Subject: [PATCH] 库存调整支持修改客户信息和备注

---
 src/main/java/com/zy/asrs/entity/Mat.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index aae5257..0e6d939 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -59,8 +59,15 @@
      * 鍟嗗搧缂栧彿
      */
     @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    @ExcelProperty(value = "鍟嗗搧缂栫爜")
+    @ExcelProperty(value = "鍟嗗搧缂栧彿")
     private String matnr;
+
+    /**
+     * 鍟嗗搧缂栧彿
+     */
+    @ApiModelProperty(value= "鏂板晢鍝佺紪鍙�")
+    @ExcelProperty(value = "鏂板晢鍝佺紪鍙�")
+    private String matnrNew;
 
 
     /**
@@ -306,17 +313,26 @@
     @ExcelProperty(value = "澶囨敞")
     private String memo;
 
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓婇檺
+     */
     @TableField("store_max")
     private Double storeMax;
 
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓嬮檺
+     */
     @TableField("store_min")
     private Double storeMin;
 
+    /**
+     * 搴撻緞棰勮涓婇檺
+     */
     @TableField("store_max_date")
     private Integer storeMaxDate;
 
     /**
-     * 鏄惁涓洪绻佸叆鍑哄簱鐗╂枡
+     * 楂橀鍏ュ嚭搴撶墿鏂�
      */
     @TableField("inout_everyday")
     private Boolean inoutEveryday;
@@ -510,7 +526,7 @@
 
     public String getStoreMax$(){
         if (Cools.isEmpty(this.storeMax)) {
-            return "鏈缃�";
+            return "";
         }else {
             return this.storeMax + "";
         }
@@ -518,7 +534,7 @@
 
     public String getStoreMin$(){
         if (Cools.isEmpty(this.storeMin)) {
-            return "鏈缃�";
+            return "";
         }else {
             return this.storeMin + "";
         }
@@ -526,9 +542,9 @@
 
     public String getStoreMaxDate$(){
         if (Cools.isEmpty(this.storeMaxDate)) {
-            return "鏈缃�";
+            return "";
         }else {
-            return this.storeMaxDate + "澶�";
+            return this.storeMaxDate + "";
         }
     }
 

--
Gitblit v1.9.1