Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -10,6 +10,58 @@
      Children:
      [
        #child: ActionBarPageData
        #child: ActionBarPageSales
        #child: applicationDevelopmentActionBarPageDef_1
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterItem
    {
      #keys: '[414384.0.814451217]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAndSaleBudgeFilterItem]*'
      Properties:
      [
        Taborder: 40
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterMonth
    {
      #keys: '[414384.0.814441070]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAndSaleBudgeFilterMonth]*'
      Properties:
      [
        Taborder: 41
      ]
    }
    Component DataHolderCapacityAndSaleBudgeFilterYear
    {
      #keys: '[414384.0.814441076]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAndSaleBudgeFilterYear]*'
      Properties:
      [
        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
      ]
    }
  ]