From 6105a2d7b44ad0bf0d73d19df34158e9acff75af Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 06 七月 2023 09:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index db5d64d..0d05e7b 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -50,8 +50,7 @@
       <PropertyDef name="foodType">
         <Property name="label">绮鎬ц川</Property>
         <Property name="mapping">
-          <Property name="mapValues"> ${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}&#xD;
-                    </Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -62,8 +61,7 @@
       <PropertyDef name="type">
         <Property name="label">妫�楠岀被鍒�</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}&#xD;
-                    </Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -73,9 +71,7 @@
         <Property name="label">妫�楠屼緷鎹�</Property>
         <Property name="required">true</Property>
         <Property name="mapping">
-          <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;qualityManagerPR#triggerStandard&quot;).getResult()}
-                    </Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerStandard&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -158,9 +154,7 @@
       <PropertyDef name="type">
         <Property name="label">妫�楠岀被鍒�</Property>
         <Property name="mapping">
-          <Property name="mapValues">
-                        ${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}
-                    </Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;qualityManagerPR#triggerType&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>

--
Gitblit v1.9.3