From 05d218bdda3f09aa5d057fda916f5f0b668fb720 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 17:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index d04e472..4c90904 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -168,6 +168,7 @@
 				trainingRegistration1.setIsExam(1);
 				trainingRegistration1.setTrainingTime(new Date());
 				trainingRegistration1.setUserId(userId);
+				trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
 				trainingRegistrationService.save(trainingRegistration1);
 				//修改保安报名状态
 				user.setIsTrain(1);
@@ -180,6 +181,7 @@
 					trainingRegistration1.setIsExam(1);
 					trainingRegistration1.setTrainingTime(new Date());
 					trainingRegistration1.setUserId(userId);
+					trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
 					trainingRegistrationService.save(trainingRegistration1);
 					//修改保安报名状态
 					user.setIsTrain(1);

--
Gitblit v1.9.3