From 42f46304bc28d9fb2bee770668b70204d877db93 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期五, 22 九月 2023 17:24:31 +0800
Subject: [PATCH] Merge branch 'dev_yy' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader#545.def |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
index 4ff0600..26dee9c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
@@ -87,7 +87,7 @@
         ButtonSize: 'compact'
         Description: '璁㈠崟閿佸畾'
         Label: '閿佸畾'
-        Taborder: 7
+        Taborder: 8
       ]
     }
     Component ButtonOrderLockHeaderUnlock
@@ -99,7 +99,7 @@
         ButtonSize: 'compact'
         Description: '璁㈠崟瑙i攣'
         Label: '瑙i攣'
-        Taborder: 8
+        Taborder: 9
       ]
     }
     Component ButtonOrderLockHeaderClear
@@ -114,6 +114,18 @@
         Taborder: 6
       ]
     }
+    Component ButtonOrderLockHeaderFresh
+    {
+      #keys: '[412960.0.259721852]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        ButtonSize: 'compact'
+        Description: '浠庢暟鎹簮鍒锋柊璁㈠崟鏁版嵁'
+        Label: '閲嶆柊鑾峰彇璁㈠崟'
+        Taborder: 7
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3