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_FormDemandComparison/_ROOT_Component_FormDemandComparison.def |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
index 6d79dcf..2ec5105 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
@@ -8,7 +8,8 @@
   Children:
   [
     #child: PanelDemandComparison
-    #child: PanelOperation
+    #child: PanelDemandComparison294
+    #child: pProductAttributeFilter_697
   ]
   Properties:
   [

--
Gitblit v1.9.3