Merge branch 'dev' into test

hongji.li

2023-10-13 4cba27f9f5313358e199bba0f2e3d033cd1de13b

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -13,6 +13,7 @@
        #child: ActionBarPageSales
        #child: applicationDevelopmentActionBarPageDef_1
        #child: ActionBarPagePlan
        #child: ActionBarPageInventory
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterItem