Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -11,6 +11,7 @@
      [
        #child: ActionBarPageData
        #child: ActionBarPageSales
        #child: applicationDevelopmentActionBarPageDef_1
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterItem
@@ -43,5 +44,25 @@
        Taborder: 42
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterBusinessType
    {
      #keys: '[414384.0.874472860]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAndSaleBudgeFilterBusinessType]*'
      Properties:
      [
        Taborder: 43
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray
    {
      #keys: '[414384.0.874472866]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAndSaleBudgeFilterPlaceOfProductionOfArray]*'
      Properties:
      [
        Taborder: 44
      ]
    }
  ]
}