Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java

@@ -95,7 +95,7 @@
                  user.setIsTrain(1);
                  userService.updateById(user);
               }else {
                  if (2 == user.getIsTrain()) {
                  if (2 == user.getIsTrain()  || -1==user.getIsTrain() || 3==user.getIsTrain()) {
                     trainingRegistration.setIsExam(1);
                     trainingRegistration.setCancel(1);
                     trainingRegistration.setTrainingTime(new Date());