From cac7ab84d3cb339d6d4e0961f48a104e268dbee4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 18:02:35 +0800
Subject: [PATCH] 代码合并修改2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index b1d1120..f0814cb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -542,23 +542,21 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Property name="readOnly">true</Property>
+ <AutoFormElement id="formItemCustomerName" layoutConstraint="colSpan:2">
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
<Property name="name">targetNumber</Property>
<Property name="property">targetNumber</Property>
<Property name="readOnly">false</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">targetNumber</Property>
- <Property name="property">targetNumber</Property>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
--
Gitblit v1.9.3