From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 9c815cb..83ea38b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -671,9 +671,10 @@
             <Property name="trigger">listDropYN</Property>
             <Editor/>
           </AutoFormElement>
-          <AutoFormElement>
+          <AutoFormElement layoutConstraint="colSpan:2">
             <Property name="name">remark</Property>
             <Property name="property">remark</Property>
+            <Property name="editorType">TextArea</Property>
             <Editor/>
           </AutoFormElement>
         </AutoForm>

--
Gitblit v1.9.3