Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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