Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-06-14 42e52dd7a48775cd83be92cc46ea42aa124cb15c

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -12,6 +12,12 @@
        #child: ActionBarPageData
        #child: ActionBarPageSales
        #child: applicationConfigureActionBarPageDef
        #child: ActionBarPageInventory
        #child: ActionBarPageRestraint
        #child: ActionBarPageScenarioSelection
        #child: applicationFixedPageActionBarPageDef
        #child: applicationDevelopmentActionBarPageDef_1
        #child: abpAlgorithmPostProcessing
      ]
    }
    Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -172,16 +178,6 @@
      Properties:
      [
        Taborder: 51
      ]
    }
    Component dhCalendarUse
    {
      #keys: '[415136.0.667561067]'
      BaseType: 'WebDataHolder'
      Databinding: 'LibCal_Calendar'
      Properties:
      [
        Taborder: 56
      ]
    }
  ]