From 31db311cbc564a85ed843913c32017c77705e148 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 十月 2023 10:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into tzskwcs
---
src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
index adf304d..34304c4 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
@@ -171,9 +171,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵�佹暟鎹�
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵�佹暟鎹�")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleErrLog() {}
- public BasShuttleErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer shuttleNo,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 BasShuttleErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer shuttleNo, 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;
@@ -195,6 +202,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
--
Gitblit v1.9.1