From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
index eb6b6c9..1462b60 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
-Component listActionBarPage690
+Component listActionBarPage963
 {
-  #keys: '[414996.1.211222174]'
+  #keys: '[414996.1.218091292]'
   BaseType: 'listActionBarPage'
   Properties:
   [

--
Gitblit v1.9.3