From 57c998f034a16bb50b7a9e6e71caf6f9e5d5c2fc Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 27 六月 2022 13:58:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/entity/Mat.java | 6 +++++-
1 files changed, 5 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..edeaf84 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;
/**
@@ -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