Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def

@@ -7,10 +7,11 @@
  [
    #child: PanelSelection
    #child: PanelOperation_568
    #child: PanelFilter
  ]
  Properties:
  [
    FixedSize: true
    Taborder: 0
    Taborder: 1
  ]
}