Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-21 765e7ec8426f896bf78a8749e38bd1656ca05474

 _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 );
  *]