Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Method_DataDistribution.def

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