From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index 5b089cd..e0b60b0 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.NodeService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.Host;
import com.zy.system.entity.User;
import com.zy.system.service.HostService;
@@ -148,7 +149,7 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Integer count;
+ private Double count;
/**
@@ -196,6 +197,13 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("produce_time")
+ private Date produceTime;
/**
* 澶囨敞
@@ -328,6 +336,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getProduceTimeTime$(){
+ if (Cools.isEmpty(this.produceTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.produceTime);
+ }
+
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
@@ -349,6 +364,9 @@
}
return this.stockFreeze == 1 ? "姝ｅ父" : "鍐荤粨";
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
--
Gitblit v1.9.1