Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_NewScenario#549.def

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