Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java

@@ -61,5 +61,5 @@
    * 查询已报名培训公司未关联考试的人员
    * @return
    */
    List<Long> getTrainIds();
    List<TrainingRegistration> getTrainIds(TrainingRegistrationVo trainingRegistrationVo);
}