Merge branch 'dev_cyy' into dev

hongji.li

2023-09-24 2709b3e28de35a866a65fa72f589d38a43d5045b

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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