From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index c5fc2e3..1e7320a 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -85,9 +85,9 @@
@Column(name = "PUSH_PROTOCOL_", length = 20)
private String pushProtocol;
- @PropertyDef(label = "鐪佸钩鍙板崗璁�")
- @Column(name = "PROVINCE_PROTOCOL_", length = 20)
- private String provinceProtocol;
+// @PropertyDef(label = "鐪佸钩鍙板崗璁�")
+// @Column(name = "PROVINCE_PROTOCOL_", length = 20)
+// private String provinceProtocol;
@PropertyDef(label = "鍚屾鍗忚")
@Column(name = "SYNC_PROTOCOL_", length = 20)
@@ -105,4 +105,13 @@
@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
private String remark;
+
+ @Column(name = "CABLE_RULE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
+ private String cableRule;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "绛掍粨灞傝鍒�", description = "閽堝绛掍粨")
+ private String cableCir;
+
}
--
Gitblit v1.9.3