From fdf2903b8944b80877e7df5d0da38f34b5d84ed9 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 04 十二月 2023 15:02:28 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/asrs/entity/BasLiftErrLog.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
index 4ccafad..6976152 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
@@ -186,9 +186,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftErrLog() {}
- public BasLiftErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer liftNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasLiftErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer liftNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -210,6 +217,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasLiftErrLog basLiftErrLog = new BasLiftErrLog(
--
Gitblit v1.9.1