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

---
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
index 23b9386..0c8c1ff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
@@ -7,8 +7,7 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: PanelDemandComparison
-    #child: PanelDemandComparison294
+    #child: pMainPanel_767
   ]
   Properties:
   [

--
Gitblit v1.9.3