From 642ffe272e766efc3fc23f02b324817a94ed6d92 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 17:46:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetLoadedMacroPlans.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetLoadedMacroPlans.def
similarity index 85%
rename from _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def
rename to _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetLoadedMacroPlans.def
index 695b69b..722af75 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetLoadedMacroPlans.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
 #parent: #root
-Method GetMacroPlans () as structured[MacroPlan] id:Method_ApplicationMacroPlanner_GetMacroPlans
+Method GetLoadedMacroPlans () as structured[MacroPlan] id:Method_ApplicationMacroPlanner_GetLoadedMacroPlans
 {
   #keys: '[412672.1.82702269]'
   Body:

--
Gitblit v1.9.3