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

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

 _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
      ]
    }
  ]
}