From e7ba6232e39e30283a4e7f775eb997fc9da8e52e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 11 十月 2023 10:26:08 +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 | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 668b6b8..942c861 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -69,8 +69,8 @@
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("ste_no")
- private Integer steNo;
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
/**
* 杈圭紭搴撲綅
@@ -493,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