From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/Device.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Device.java b/igds-core/src/main/java/com/ld/igds/models/Device.java
index eebb08e..be25a08 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Device.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Device.java
@@ -66,9 +66,9 @@
@PropertyDef(label = "璁惧鍔熺巼", description = "璁惧鍔熺巼锛屾病鏈夊彲涓嶅～鍐�:KW/H")
private Double power;
- @Column(name = "MODBUS_",length = 100)
- @PropertyDef(label = "Modbus閰嶇疆")
- private String modbus;
+// @Column(name = "MODBUS_",length = 100)
+// @PropertyDef(label = "Modbus閰嶇疆")
+// private String modbus;
@Column(name = "REMARK_", length = 250)
@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
@@ -78,9 +78,9 @@
@PropertyDef(label = "鍏宠仈璁惧閫氶亾", description = "閽堝鍙岄�氶亾閰嶇疆璁惧锛屽娣锋祦椋庡彛鐨勯鏈恒�佽酱娴侀鍙ｇ殑椋庢満")
private String link;
- @Column(name = "LINK_MODBUS_",length = 100)
- @PropertyDef(label = "鍏宠仈璁惧Modbus")
- private String linkModbus;
+// @Column(name = "LINK_MODBUS_",length = 100)
+// @PropertyDef(label = "鍏宠仈璁惧Modbus")
+// private String linkModbus;
@Column(name = "EXT1_", length = 20)
@PropertyDef(label = "鎵╁睍瀛楁1", description = "鏍规嵁涓氬姟闇�瑕佽嚜瀹氫箟瀛樺偍鍊�")
--
Gitblit v1.9.3