Merge remote-tracking branch 'origin/master'

zengh

2021-07-29 8ca64d03d58db959d95f49119be0cb322d6edf2f

 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -56,7 +56,7 @@
    */
   @PostMapping("/update")
   public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
      arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
//      arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
      return R.status(trainingRegistrationService.updateById(trainingRegistration));
   }

@@ -66,7 +66,9 @@
    */
   @PostMapping("/submit")
   public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
      arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
      trainingRegistration.setTrainingTime(new Date());
      trainingRegistration.setCancel(1);
//      arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
      return R.status(trainingRegistrationService.saveOrUpdate(trainingRegistration));
   }