From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期一, 25 九月 2023 22:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
index 3684ed8..237e0c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
@@ -53,16 +53,6 @@
         Visible: false
       ]
     }
-    Component CheckboxIsCapacity
-    {
-      #keys: '[414384.0.857770765]'
-      BaseType: 'WebCheckbox'
-      Properties:
-      [
-        Label: '浜ц兘'
-        Taborder: 5
-      ]
-    }
     Component DropDownTimeGroup
     {
       #keys: '[414384.0.857771238]'
@@ -87,6 +77,18 @@
         Taborder: 0
       ]
     }
+    Component DropDownSaleOrCapacity
+    {
+      #keys: '[414384.0.886240556]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        InitialValue: '閿�鍞'
+        Label: '閿�鍞/浜ц兘'
+        Strings: '閿�鍞;浜ц兘'
+        Taborder: 5
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3