Merge branch 'dev' into dev_cyy20231026

chaiyunying

2023-10-31 135b749777d8b87f0f670794ab408d0f9bf61028

 _Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Method_DataDistribution.def

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