Merge branch 'dev' into dev_lrs

xiaoding721

2023-11-01 d2ec6798fa2cc711abd8c4e0bad8e4dbe431ddcc

 _Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Method_DataDistribution.def

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