Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

yanyuan

2023-11-01 f264274b13f4371ea205c0c0219db3358bd55af0

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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