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

---
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft#545.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
index 592611f..157b7ab 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
@@ -5,7 +5,7 @@
   BaseType: 'WebPanel'
   Children:
   [
-    #child: pProductAttributeFilter189
+    #child: pProductAttributeFilter
   ]
   Properties:
   [

--
Gitblit v1.9.3