Merge branch 'dev' into dev_yy

yanyuan

2023-11-01 c673b37d38537c136cd488b8430146573975d5e3

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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