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/Component_pExport#437.def |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def"
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def"
index 40d7bc0..6d87796 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pExport\043437.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pExport
+Component pExport id:pExport_437
 {
-  #keys: '[412672.1.111157999]'
+  #keys: '[414996.1.207566025]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component bExport id:bExport_474
+    Component bExport
     {
-      #keys: '[412672.1.111158037]'
+      #keys: '[414996.1.207566026]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -15,16 +15,16 @@
         Taborder: 0
       ]
     }
-    Component dhXMLDataListener id:dhXMLDataListener_801
+    Component dhXMLDataListener
     {
-      #keys: '[412672.1.111158064]'
+      #keys: '[414996.1.207566027]'
       BaseType: 'WebDataHolder'
       Databinding: 'ExportXMLManager'
       Children:
       [
-        Component DataExtractorRibbon id:DataExtractorRibbon_462
+        Component DataExtractorRibbon
         {
-          #keys: '[412672.1.111158065]'
+          #keys: '[414996.1.207566028]'
           BaseType: 'WebDataExtractor'
           Properties:
           [

--
Gitblit v1.9.3