From 46607139e955ca266e24bd8561bca1f93a650178 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
index 8939674..79d3e56 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
@@ -69,7 +69,7 @@
* 搴撲綅ID
*/
@ApiModelProperty(value= "搴撲綅ID")
- @TableField("node_id")
+ @TableField("nodeId")
private Long nodeId;
/**
@@ -217,13 +217,16 @@
@ApiModelProperty(value= "淇敼浜哄憳ID")
@TableField("update_by")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateBy;
+ private Integer updateBy;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @TableField("wrk_no")
+ private String wrkNo;
public PickoutDetl() {}
@@ -471,20 +474,9 @@
this.updateTime = updateTime;
}
- public Date getUpdateBy() {
- return updateBy;
- }
- public String getUpdateBy$(){
- if (Cools.isEmpty(this.updateBy)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateBy);
- }
- public void setUpdateBy(Date updateBy) {
- this.updateBy = updateBy;
- }
+
public String getMemo() {
return memo;
--
Gitblit v1.9.1