From 5cbda986bdf5af9eef9c4d52f48fb6ad41362bab Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期四, 21 九月 2023 23:59:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

---
 _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperationButton#713.def |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def "b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperationButton\043713.def"
similarity index 91%
rename from _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperationButton\043713.def"
index ffc4427..9c91139 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperationButton\043713.def"
@@ -1,5 +1,5 @@
 Quintiq file version 2.0
-Component PanelPriorityPolicyOperation713
+Component PanelPriorityPolicyOperationButton
 {
   #keys: '[414382.0.494931742]'
   BaseType: 'WebPanel'
@@ -33,16 +33,6 @@
       [
         Label: '*'
         Taborder: 3
-      ]
-    }
-    Component StringListPriorityPolicyOperation
-    {
-      #keys: '[414382.0.494931746]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: '浼樺厛绾у洜瀛�:'
-        Taborder: 0
       ]
     }
     Component ButtonMultiply
@@ -95,6 +85,16 @@
         Taborder: 8
       ]
     }
+    Component DropDownStringList
+    {
+      #keys: '[414382.0.501480353]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        Label: '浼樺厛绾у洜瀛�'
+        Taborder: 0
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3