Merge branch 'dev_lhj' into dev

hongji.li

2023-10-07 9771a9de0e5f7b291ee89ff6a063eec0b8981d64

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

@@ -6,5 +6,6 @@
  Children:
  [
    #child: pnlContent
    #child: pnlActions
  ]
}