Merge remote-tracking branch 'origin/master'

WS

2023-08-17 899d74ab3d00f7d0b0909d23551b1f971e2edea4

 src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml

@@ -6,43 +6,43 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1104</Property>
      <PropertyDef name="lydbh">
        <Property/>
        <Property></Property>
        <Property name="label">粮油店编号</Property>
      </PropertyDef>
      <PropertyDef name="xzqhbm">
        <Property/>
        <Property></Property>
        <Property name="label">行政区划编码</Property>
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property/>
        <Property></Property>
        <Property name="label">行政区划名称</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property/>
        <Property></Property>
        <Property name="label">军粮企业编号</Property>
      </PropertyDef>
      <PropertyDef name="jlqymc">
        <Property/>
        <Property></Property>
        <Property name="label">军粮企业名称</Property>
      </PropertyDef>
      <PropertyDef name="jgzdbh">
        <Property/>
        <Property></Property>
        <Property name="label">军供站点编号</Property>
      </PropertyDef>
      <PropertyDef name="jgzdmc">
        <Property/>
        <Property></Property>
        <Property name="label">军供站点名称</Property>
      </PropertyDef>
      <PropertyDef name="lydmc">
        <Property/>
        <Property></Property>
        <Property name="label">粮油店名称</Property>
      </PropertyDef>
      <PropertyDef name="lxr">
        <Property/>
        <Property></Property>
        <Property name="label">联系人</Property>
      </PropertyDef>
      <PropertyDef name="lxrdh">
        <Property/>
        <Property></Property>
        <Property name="label">联系电话</Property>
      </PropertyDef>
      <PropertyDef name="fgfw">
@@ -66,12 +66,33 @@
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="dz">
        <Property/>
        <Property></Property>
        <Property name="label">地址</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property/>
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtGBArea">
@@ -195,30 +216,39 @@
        </RowSelectorColumn>
        <DataColumn name="lydbh">
          <Property name="property">lydbh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xzqhmc">
          <Property name="property">xzqhmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lydmc">
          <Property name="property">lydmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lxr">
          <Property name="property">lxr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lxrdh">
          <Property name="property">lxrdh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sjcr">
          <Property name="property">sjcr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="dz">
          <Property name="property">dz</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
@@ -226,7 +256,7 @@
      <Property name="width">60%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">军粮企业信息</Property>
      <Property name="caption">放心粮油店</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -331,6 +361,26 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
@@ -415,7 +465,12 @@
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="userData"/>
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>