From 7a3227174bde55918aef6f411489d0dd24c3b129 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 14:09:46 +0800
Subject: [PATCH] 工作历史档可搜索返修品

---
 src/main/java/com/zy/asrs/entity/Mat.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..d06aea8 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;
@@ -56,10 +57,10 @@
     private Long tagId;
 
     /**
-     * 鍟嗗搧缂栧彿
+     * 瑙勬牸
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    @ExcelProperty(value = "鍟嗗搧缂栫爜")
+    @ApiModelProperty(value= "瑙勬牸")
+    @ExcelProperty(value = "瑙勬牸")
     private String matnr;
 
 
@@ -151,7 +152,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -351,7 +352,7 @@
 //    Mat mat = new Mat(
 //            null,    // 缂栧彿
 //            null,    // 鎵�灞炲綊绫�
-//            null,    // 鍟嗗搧缂栧彿
+//            null,    // 瑙勬牸
 //            null,    // 鍟嗗搧鍚嶇О
 //            null,    // 鍒悕
 //            null,    // 瑙勬牸
@@ -491,5 +492,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