From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml |  249 +++++++++++++------------------------------------
 1 files changed, 66 insertions(+), 183 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
index 7d8d042..ce62141 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
@@ -5,17 +5,9 @@
   <Model>
     <DataType name="dtMain">
       <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1412</Property>
-      <PropertyDef name="rkfkjlid">
+      <PropertyDef name="clyshjid">
         <Property/>
-        <Property name="label">杞﹁締ID</Property>
-      </PropertyDef>
-      <PropertyDef name="jlgljgbh">
-        <Property/>
-        <Property name="label">鍐涚伯绠$悊鏈烘瀯缂栧彿</Property>
-      </PropertyDef>
-      <PropertyDef name="jlgljgmc">
-        <Property/>
-        <Property name="label">鍐涚伯绠$悊鏈烘瀯鍚嶇О</Property>
+        <Property name="label">杞﹁締杩愯緭鐜ID</Property>
       </PropertyDef>
       <PropertyDef name="jlqybh">
         <Property/>
@@ -33,73 +25,44 @@
         <Property/>
         <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
       </PropertyDef>
+      <PropertyDef name="psdh">
+        <Property/>
+        <Property name="label">閰嶉�佸崟鍙�</Property>
+      </PropertyDef>
       <PropertyDef name="cph">
         <Property/>
-        <Property name="label">杞︾墝鍙�</Property>
+        <Property name="label">杞︾墝鍙风爜</Property>
       </PropertyDef>
-      <PropertyDef name="cllx">
+      <PropertyDef name="jcsj">
         <Property/>
-        <Property name="label">杞﹁締绫诲瀷</Property>
+        <Property name="label">鐩戞祴鏃堕棿</Property>
+        <Property name="dataType">Date</Property>
       </PropertyDef>
-      <PropertyDef name="clzt">
+      <PropertyDef name="jcwdz">
         <Property/>
-        <Property name="label">杞﹁締鐘舵��</Property>
-      </PropertyDef>
-      <PropertyDef name="sfnbcl">
-        <Property/>
-        <Property name="label">鏄惁鍐呴儴杞﹁締</Property>
-      </PropertyDef>
-      <PropertyDef name="bd4gkh">
-        <Property/>
-        <Property name="label">缁戝畾4G鍗″彿</Property>
-      </PropertyDef>
-      <PropertyDef name="bdbdh">
-        <Property/>
-        <Property name="label">缁戝畾鍖楁枟鍙�</Property>
-      </PropertyDef>
-      <PropertyDef name="jsr">
-        <Property/>
-        <Property name="label">椹鹃┒浜�</Property>
-      </PropertyDef>
-      <PropertyDef name="lxdh">
-        <Property/>
-        <Property name="label">鑱旂郴鐢佃瘽</Property>
-      </PropertyDef>
-      <PropertyDef name="sfzh">
-        <Property/>
-        <Property name="label">韬唤璇佸彿</Property>
-      </PropertyDef>
-      <PropertyDef name="jsz">
-        <Property/>
-        <Property name="label">椹鹃┒璇�</Property>
-      </PropertyDef>
-      <PropertyDef name="xsz">
-        <Property/>
-        <Property name="label">琛岄┒璇�</Property>
-      </PropertyDef>
-      <PropertyDef name="clcxc">
+        <Property name="label">娓╁害鍊�</Property>
         <Property name="dataType">double</Property>
-        <Property name="label">杞︾闀�</Property>
       </PropertyDef>
-      <PropertyDef name="clcxk">
+      <PropertyDef name="sdz">
+        <Property/>
+        <Property name="label">婀垮害鍊�</Property>
         <Property name="dataType">double</Property>
-        <Property name="label">杞︾瀹�</Property>
       </PropertyDef>
-      <PropertyDef name="clcxg">
-        <Property name="dataType">double</Property>
-        <Property name="label">杞︾楂�</Property>
-      </PropertyDef>
-      <PropertyDef name="dz">
+      <PropertyDef name="wdsfzc">
         <Property/>
-        <Property name="label">鍦板潃</Property>
+        <Property name="label">娓╁害鏄惁姝e父锛�</Property>
       </PropertyDef>
-      <PropertyDef name="sfyx">
+      <PropertyDef name="sdsfzc">
         <Property/>
-        <Property name="label">鏄惁鏈夋晥</Property>
+        <Property name="label">婀垮害鏄惁姝e父锛�</Property>
       </PropertyDef>
-      <PropertyDef name="bz">
+      <PropertyDef name="cyr">
         <Property/>
-        <Property name="label">澶囨敞</Property>
+        <Property name="label">鎵胯繍浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="cyrdh">
+        <Property/>
+        <Property name="label">鎵胯繍浜虹數璇�</Property>
       </PropertyDef>
       <PropertyDef name="bizId">
         <Property></Property>
@@ -210,14 +173,8 @@
         <RowSelectorColumn>
           <Property name="caption">涓婁紶</Property>
         </RowSelectorColumn>
-        <DataColumn name="rkfkjlid">
-          <Property name="property">rkfkjlid</Property>
-        </DataColumn>
-        <DataColumn name="jlgljgbh">
-          <Property name="property">jlgljgbh</Property>
-        </DataColumn>
-        <DataColumn name="jlgljgmc">
-          <Property name="property">jlgljgmc</Property>
+        <DataColumn name="clyshjid">
+          <Property name="property">clyshjid</Property>
         </DataColumn>
         <DataColumn name="jlqybh">
           <Property name="property">jlqybh</Property>
@@ -231,56 +188,32 @@
         <DataColumn name="jgzdmc">
           <Property name="property">jgzdmc</Property>
         </DataColumn>
+        <DataColumn name="psdh">
+          <Property name="property">psdh</Property>
+        </DataColumn>
         <DataColumn name="cph">
           <Property name="property">cph</Property>
         </DataColumn>
-        <DataColumn name="cllx">
-          <Property name="property">cllx</Property>
+        <DataColumn name="jcsj">
+          <Property name="property">jcsj</Property>
         </DataColumn>
-        <DataColumn name="clzt">
-          <Property name="property">clzt</Property>
+        <DataColumn name="jcwdz">
+          <Property name="property">jcwdz</Property>
         </DataColumn>
-        <DataColumn name="sfnbcl">
-          <Property name="property">sfnbcl</Property>
+        <DataColumn name="sdz">
+          <Property name="property">sdz</Property>
         </DataColumn>
-        <DataColumn name="bd4gkh">
-          <Property name="property">bd4gkh</Property>
+        <DataColumn name="wdsfzc">
+          <Property name="property">wdsfzc</Property>
         </DataColumn>
-        <DataColumn name="bdbdh">
-          <Property name="property">bdbdh</Property>
+        <DataColumn name="sdsfzc">
+          <Property name="property">sdsfzc</Property>
         </DataColumn>
-        <DataColumn name="jsr">
-          <Property name="property">jsr</Property>
+        <DataColumn name="cyr">
+          <Property name="property">cyr</Property>
         </DataColumn>
-        <DataColumn name="lxdh">
-          <Property name="property">lxdh</Property>
-        </DataColumn>
-        <DataColumn name="sfzh">
-          <Property name="property">sfzh</Property>
-        </DataColumn>
-        <DataColumn name="jsz">
-          <Property name="property">jsz</Property>
-        </DataColumn>
-        <DataColumn name="xsz">
-          <Property name="property">xsz</Property>
-        </DataColumn>
-        <DataColumn name="clcxc">
-          <Property name="property">clcxc</Property>
-        </DataColumn>
-        <DataColumn name="clcxk">
-          <Property name="property">clcxk</Property>
-        </DataColumn>
-        <DataColumn name="clcxg">
-          <Property name="property">clcxg</Property>
-        </DataColumn>
-        <DataColumn name="dz">
-          <Property name="property">dz</Property>
-        </DataColumn>
-        <DataColumn name="sfyx">
-          <Property name="property">sfyx</Property>
-        </DataColumn>
-        <DataColumn name="bz">
-          <Property name="property">bz</Property>
+        <DataColumn name="cyrdh">
+          <Property name="property">cyrdh</Property>
         </DataColumn>
         <DataColumn name="bizId">
           <Property name="property">bizId</Property>
@@ -300,7 +233,7 @@
       <Property name="width">85%</Property>
       <Property name="closeable">false</Property>
       <Property name="iconClass">fa fa-sliders</Property>
-      <Property name="caption">鍙f劅璇勪环</Property>
+      <Property name="caption">杞﹁締杩愯緭鐜</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -327,18 +260,8 @@
           <Property name="labelSeparator">:</Property>
           <Property name="labelAlign">left</Property>
           <AutoFormElement>
-            <Property name="name">rkfkjlid</Property>
-            <Property name="property">rkfkjlid</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">jlgljgbh</Property>
-            <Property name="property">jlgljgbh</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">jlgljgmc</Property>
-            <Property name="property">jlgljgmc</Property>
+            <Property name="name">clyshjid</Property>
+            <Property name="property">clyshjid</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -362,88 +285,48 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">psdh</Property>
+            <Property name="property">psdh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">cph</Property>
             <Property name="property">cph</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">cllx</Property>
-            <Property name="property">cllx</Property>
+            <Property name="name">jcsj</Property>
+            <Property name="property">jcsj</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">clzt</Property>
-            <Property name="property">clzt</Property>
+            <Property name="name">jcwdz</Property>
+            <Property name="property">jcwdz</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">sfnbcl</Property>
-            <Property name="property">sfnbcl</Property>
+            <Property name="name">sdz</Property>
+            <Property name="property">sdz</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">bd4gkh</Property>
-            <Property name="property">bd4gkh</Property>
+            <Property name="name">wdsfzc</Property>
+            <Property name="property">wdsfzc</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">bdbdh</Property>
-            <Property name="property">bdbdh</Property>
+            <Property name="name">sdsfzc</Property>
+            <Property name="property">sdsfzc</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">jsr</Property>
-            <Property name="property">jsr</Property>
+            <Property name="name">cyr</Property>
+            <Property name="property">cyr</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">lxdh</Property>
-            <Property name="property">lxdh</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">sfzh</Property>
-            <Property name="property">sfzh</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">jsz</Property>
-            <Property name="property">jsz</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">xsz</Property>
-            <Property name="property">xsz</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">clcxc</Property>
-            <Property name="property">clcxc</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">clcxk</Property>
-            <Property name="property">clcxk</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">clcxg</Property>
-            <Property name="property">clcxg</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">dz</Property>
-            <Property name="property">dz</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">sfyx</Property>
-            <Property name="property">sfyx</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">bz</Property>
-            <Property name="property">bz</Property>
+            <Property name="name">cyrdh</Property>
+            <Property name="property">cyrdh</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>

--
Gitblit v1.9.3