From 7125be069f3f926afe3e15366e9211646de1c637 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 19 七月 2024 15:35:12 +0800
Subject: [PATCH] 中间表代码提交,初步测试完成

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

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 0a02150..5e779e6 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -151,7 +152,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -305,6 +306,58 @@
     @ApiModelProperty(value= "澶囨敞")
     @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("auto_id")
+//    private Integer autoId;
+//    /**
+//     * 璁㈠崟鍙�
+//     */
+//    @TableField("out_order_no")
+//    private String outOrderNo;
+//
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("lu_hao")
+//    private String luHao;
+//
+//    /**
+//     * 宸ュ崟鍙�
+//     */
+//    @TableField("pg_no")
+//    private String sPgNO;
+
+    @TableField("temp1")
+    private String temp1;
+
+    @TableField("temp2")
+    private String temp2;
+
+    @TableField("temp3")
+    private String temp3;
+
+
 
     public Mat() {}
 
@@ -491,5 +544,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 
 }

--
Gitblit v1.9.1