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_FormDemandComparison/Component_pDemandComparison#822.def |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
index 7dd3886..3cdf2dc 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
@@ -15,7 +15,7 @@
         Taborder: 1
       ]
     }
-    Component dhCheckedProduct
+    Component dhCheckedProducts
     {
       #keys: '[414996.1.211223499]'
       BaseType: 'WebDataHolder'
@@ -40,7 +40,7 @@
         Taborder: 3
       ]
     }
-    Component dhFinelProduct
+    Component dhFinelProducts
     {
       #keys: '[414996.1.211223501]'
       BaseType: 'WebDataHolder'
@@ -50,7 +50,7 @@
         Taborder: 2
       ]
     }
-    Component dhCheckedSalesSegment
+    Component dhCheckedSalesSegments
     {
       #keys: '[414996.1.211223502]'
       BaseType: 'WebDataHolder'

--
Gitblit v1.9.3