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/view/Building.view.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
index 695fb29..b42c9b7 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -83,6 +83,10 @@
<Property name="property">height</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="diameter">
+ <Property name="property">diameter</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn>
<Property name="property">ground</Property>
<Property name="name">ground</Property>
@@ -150,11 +154,6 @@
<Property name="name">id</Property>
<Property name="property">id</Property>
<Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ggm</Property>
- <Property name="property">ggm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -231,6 +230,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deVolume</Property>
+ <Property name="property">deVolume</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">doorNum</Property>
<Property name="property">doorNum</Property>
<Editor/>
--
Gitblit v1.9.3