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

renhao

2023-10-10 861e0d435e8b4adc705c59a8d6b4daed12822c8f

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -11,6 +11,7 @@
      [
        #child: ActionBarPageData
        #child: ActionBarPageSales
        #child: applicationDevelopmentActionBarPageDef_1
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterItem