Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

xiaoding721

2024-12-24 d4a08c8d814543094e3ac1f1288c9a3820c210c1

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def

@@ -7,8 +7,7 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: PanelRibbon
    #child: PanelDemandComparison_634
    #child: pMainPanel_549
  ]
  Properties:
  [