From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/asrs/entity/DeviceConfig.java | 3 +++
1 files changed, 3 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 05edb04..1eb09fb 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceConfig.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
@@ -84,6 +84,9 @@
@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