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

hongji.li

2023-10-25 7f3013469c740ad55dfe21e04738a8933dd8224c

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/_ROOT_Component_DialogCreateEditScenario.def

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