Merge branch 'dev_fix_Branch' into dev_lhj

hongji.li

2023-11-06 817c03784e8d604780d9f2cd2ee3130c1a71f5d6

 _Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Method_DataDistribution.def

@@ -9,8 +9,6 @@
  [*
    DataHolderScenario.Data( scenario );
    
    dropDownStringListGeneral.Strings( GlobalOTDTable::GetBusnessStrings( GlobalOTDTable ) );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]
}