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

hongji.li

2023-11-03 aefafd2142478d4fb07d6b8b45c3047e247389e0

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationDevelopmentActionBarPageDef#1.def

@@ -4,5 +4,6 @@
  Children:
  [
    #child: abgTest
    #child: abgInterfaceTest
  ]
}