Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditSixDigitCode/Method_OnOK.def

@@ -8,7 +8,12 @@
    // On ok
    Form.ApplyChanges();
    
    DataHolderDialogData.Data().Commit();
    data := DataHolderDialogData.Data();
    
    data.VehicleModel( guard( ddlVehicleModel.Data().Name(), "" ) );
    data.EnginePartNumber( guard( ddlEnginePartNumber.Data().ID(), "" ) );
    
    data.Commit();
    
    Form.Close();
  *]