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_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def
similarity index 85%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def
index 21ba77d..a9313e1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_437_bExport_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pExport/bExport_474
-Response OnClick () id:Response_pExport_bExport_OnClick
+#parent: pExport_437/bExport
+Response OnClick () id:Response_pExport_437_bExport_OnClick
 {
-  #keys: '[412672.1.111158036]'
+  #keys: '[414996.1.207566015]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction

--
Gitblit v1.9.3