From e7c56c4676e153f0af05083b1f5ab0ed73d4b2c3 Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期四, 12 十月 2023 19:19:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews#633.def |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def"
index b9da9db..71b9352 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews\043633.def"
@@ -7,10 +7,6 @@
     {
       #keys: '[414382.0.436830247]'
       BaseType: 'WebButton'
-      Children:
-      [
-        #child: ContextMenuSalesFillingCapacity
-      ]
       Properties:
       [
         Image: 'BLOT'
@@ -29,5 +25,16 @@
         Taborder: 4
       ]
     }
+    Component ButtonOffsetting
+    {
+      #keys: '[414702.1.20970764]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'PRICE_STICKER'
+        Label: '鍐插噺'
+        Taborder: 5
+      ]
+    }
   ]
 }

--
Gitblit v1.9.3