From a673b25a0bc23b3b8b914088bdb7dca3d2e89d45 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:18:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/models/igds.model.xml | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 7dd3e2f..3ac10d3 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,6 +154,10 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="ggm">
+ <Property></Property>
+ <Property name="label">鍥借鐮�</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtDepot">
<Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -563,6 +567,26 @@
<Property></Property>
<Property name="label">浣嶇疆</Property>
</PropertyDef>
+ <PropertyDef name="modbus">
+ <Property/>
+ <Property name="label">Modbus閰嶇疆</Property>
+ </PropertyDef>
+ <PropertyDef name="ext1">
+ <Property/>
+ <Property name="label">鎵╁睍瀛楁1</Property>
+ </PropertyDef>
+ <PropertyDef name="ext2">
+ <Property/>
+ <Property name="label">鎵╁睍瀛楁2</Property>
+ </PropertyDef>
+ <PropertyDef name="ext3">
+ <Property/>
+ <Property name="label">鎵╁睍瀛楁3</Property>
+ </PropertyDef>
+ <PropertyDef name="statusName">
+ <Property/>
+ <Property name="label">褰撳墠鐘舵��</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtDeviceSer">
<Property name="creationType">com.ld.igds.models.DeviceSer</Property>
@@ -894,6 +918,10 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="gasSer">
+ <Property></Property>
+ <Property name="label">姘斾綋鍒嗘満</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtDicSlogan">
<Property name="creationType">com.ld.igds.models.DicSlogan</Property>
--
Gitblit v1.9.3