From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/view/Settle.view.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/Settle.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/Settle.view.xml
index b8eeb50..f2b60a5 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/Settle.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/Settle.view.xml
@@ -31,12 +31,12 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">0</Property>
- <Property name="value">0锛氱幇閲�</Property>
+ <Property name="key">IN</Property>
+ <Property name="value">鍏ュ簱</Property>
</Entity>
<Entity>
- <Property name="key">1</Property>
- <Property name="value">1锛氳浆璐�</Property>
+ <Property name="key">OUT</Property>
+ <Property name="value">鍑哄簱</Property>
</Entity>
</Collection>
</Property>
@@ -44,7 +44,7 @@
</PropertyDef>
<PropertyDef name="bizType">
<Property/>
- <Property name="label">澶勭悊鏂瑰紡</Property>
+ <Property name="label">缁撶畻鏂瑰紡</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
<Property name="valueProperty">value</Property>
@@ -644,6 +644,12 @@
<Property name="property">depotId</Property>
<Editor/>
</AutoFormElement>
+ <Label layoutConstraint="colSpan:1">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ <Property name="text">娉細鍚堝悓缁撶畻鏃舵棤闇�濉啓锛涘崟杞︾粨绠楁椂锛屾墍灞炰粨搴撳繀濉��</Property>
+ </Label>
<AutoFormElement>
<Property name="name">contractId</Property>
<Property name="property">contractId</Property>
--
Gitblit v1.9.3