Merge remote-tracking branch 'origin/master'

ws

2023-09-28 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990

 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>