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/WhjlApi1203.view.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml
index 5b27bf1..387952f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1203.view.xml
@@ -104,6 +104,26 @@
       <PropertyDef name="jldwbm">
         <Property></Property>
         <Property name="label">璁￠噺鍗曚綅缂栧彿</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">11</Property>
+                <Property name="value">11-鍚�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">12</Property>
+                <Property name="value">12-鍗冨厠</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">13</Property>
+                <Property name="value">13-鍗�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="jldwmc">
         <Property></Property>
@@ -263,6 +283,11 @@
       <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>
@@ -450,7 +475,7 @@
       <Property name="width">85%</Property>
       <Property name="closeable">false</Property>
       <Property name="iconClass">fa fa-sliders</Property>
-      <Property name="caption">鍐涚伯浼佷笟淇℃伅</Property>
+      <Property name="caption">鍓浜у搧淇℃伅</Property>
       <Property name="height">85%</Property>
       <Buttons>
         <Button>

--
Gitblit v1.9.3