Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-17 face55e7f35130d29d7f395a4b4501d57b97ef81

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_NewScenario.def

@@ -19,6 +19,7 @@
    
    DataHolderActionCopy.Data( false );
    DataHolderDialogData.Data( &scenario );
    DataHolderDialogData.Data().IsCreateNewVersion( true );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]