From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index dd23a2f..9b2fa2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -14,6 +14,7 @@
       </PropertyDef>
       <PropertyDef name="userId">
         <Property name="label">韬唤璇佸彿</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="noticeId">
         <Property name="label">閫氱煡鍗曞彿</Property>
@@ -22,6 +23,15 @@
         <Property name="dataType">Double</Property>
         <Property name="label">绮瀹氫环</Property>
         <Property name="required">false</Property>
+      </PropertyDef>
+      <PropertyDef name="foodType">
+        <Property name="label">绮鎬ц川</Property>
+        <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
+        </Property>
       </PropertyDef>
       <Reference name="checkItems">
         <Property name="parameter">
@@ -608,6 +618,11 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
+              <Property name="name">foodType</Property>
+              <Property name="property">foodType</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
               <Property name="name">sampleUser</Property>
               <Property name="property">sampleUser</Property>
               <Editor/>

--
Gitblit v1.9.3