Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 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/>