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

lazhen

2024-11-28 b854a10fcefa4df101f1e83271741626bf8086cf

 _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:
  [