From 830b5f394b6f5c41d259be38272d578467b53cf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 18:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
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