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