Merge branch 'dev_Kevin' into dev

hongji.li

2023-09-26 25bd6b91e3aa2b97bbd55f972e69fd72cd1a38df

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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