From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/OrderDetlLog.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
index 9fd0859..be3e8f3 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
@@ -300,6 +300,20 @@
private Integer owner;
/**
+ * 婧愪粨搴�
+ */
+ @ApiModelProperty(value= "婧愪粨搴�")
+ @TableField("source_loc_name")
+ private String sourceLocName;
+
+ /**
+ * 鐩爣浠撳簱
+ */
+ @ApiModelProperty(value= "鐩爣浠撳簱")
+ @TableField("target_loc_name")
+ private String targetLocName;
+
+ /**
* 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
*/
@ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
@@ -416,6 +430,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
+ }
+
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
--
Gitblit v1.9.1