Merge remote-tracking branch 'refs/remotes/origin/dev'

Lai,Risheng

2023-11-02 30c02e0c981b16be0918483543f4b812956c45d4

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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