From 5bd42df0ef1bcdbc3911381274b4f3f267d0203b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 13 八月 2025 09:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/asrs/entity/DeviceConfig.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DeviceConfig.java b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
index 2dd2f1e..1eb09fb 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceConfig.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
@@ -70,6 +70,23 @@
@TableField("fake")
private Integer fake;
+ /**
+ * 铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�
+ */
+ @ApiModelProperty(value= "铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�")
+ @TableField("fake_init_status")
+ private String fakeInitStatus;
+
+ /**
+ * 缃戝叧缂栧彿
+ */
+ @ApiModelProperty(value= "缃戝叧缂栧彿")
+ @TableField("gateway_id")
+ private Integer gatewayId;
+
+ @TableField(exist = false)
+ private Object otherData;
+
public DeviceConfig() {}
public DeviceConfig(String ip,Integer port,String threadImpl,Date createTime,String deviceType,Integer deviceNo) {
--
Gitblit v1.9.1