From deee597fa30e9a40792a4eb094b6ce45a35bc13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/models/igds.model.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 68c3feb..791ffe0 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,10 +154,6 @@
<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>
@@ -316,6 +312,10 @@
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="ggm">
+ <Property></Property>
+ <Property name="label">鍥借鐮�</Property>
</PropertyDef>
</DataType>
<DataType name="dtDepotStore">
@@ -604,23 +604,27 @@
<Property name="label">浣嶇疆</Property>
</PropertyDef>
<PropertyDef name="modbus">
- <Property/>
+ <Property></Property>
<Property name="label">Modbus閰嶇疆</Property>
</PropertyDef>
- <PropertyDef name="ext1">
+ <PropertyDef name="linkModbus">
<Property/>
+ <Property name="label">鍏宠仈璁惧Modbus</Property>
+ </PropertyDef>
+ <PropertyDef name="ext1">
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁1</Property>
</PropertyDef>
<PropertyDef name="ext2">
- <Property/>
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁2</Property>
</PropertyDef>
<PropertyDef name="ext3">
- <Property/>
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁3</Property>
</PropertyDef>
<PropertyDef name="statusName">
- <Property/>
+ <Property></Property>
<Property name="label">褰撳墠鐘舵��</Property>
</PropertyDef>
</DataType>
--
Gitblit v1.9.3