From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..942c861 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -65,6 +65,20 @@
@TableField("crn_no")
private Integer crnNo;
+ /**
+ * 绌挎杞�
+ */
+ @ApiModelProperty(value= "绌挎杞�")
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
+
+ /**
+ * 杈圭紭搴撲綅
+ */
+ @ApiModelProperty(value= "杈圭紭搴撲綅")
+ @TableField("out_most")
+ private Integer outMost;
+
@ApiModelProperty(value= "")
@TableField("sheet_no")
private String sheetNo;
@@ -479,13 +493,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
}
public String getLogErrTime$(){
--
Gitblit v1.9.1