From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/BasLiftOpt.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 89fe287..13de4b5 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
@@ -83,6 +83,13 @@
@TableField("system_status")
private String systemStatus;
+ /**
+ * 璁惧宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "璁惧宸ヤ綔鍙�")
+ @TableField("device_wrk")
+ private String deviceWrk;
+
public BasLiftOpt() {}
public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
--
Gitblit v1.9.1