From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期六, 19 四月 2025 08:55:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms --- src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java index 0383b98..bdf4453 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -268,6 +269,15 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + @ApiModelProperty(value= "棰勭暀1") + private String temp1; + @ApiModelProperty(value= "棰勭暀1") + private String temp2; + @ApiModelProperty(value= "棰勭暀1") + private String temp3; + @ApiModelProperty(value= "棰勭暀1") + private String temp4; + public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ return ""; @@ -356,6 +366,8 @@ } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - + public void sync(Object source) { + Synchro.Copy(source, this); + } } -- Gitblit v1.9.1