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

lihongji

2024-08-14 d0d4a34072977d5194fb981a23fce67ba1b7eae2

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -17,6 +17,9 @@
        #child: ActionBarPageScenarioSelection
        #child: applicationFixedPageActionBarPageDef
        #child: applicationDevelopmentActionBarPageDef_1
        #child: abpAlgorithmPostProcessing
        #child: ActionBarPagePlan
        #child: ActionBarPageReport
      ]
    }
    Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -179,5 +182,15 @@
        Taborder: 51
      ]
    }
    Component dhSelectedShiftDay
    {
      #keys: '[413988.0.1371211822]'
      BaseType: 'WebDataHolder'
      Databinding: 'ShiftDay'
      Properties:
      [
        Taborder: 56
      ]
    }
  ]
}