Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -144,7 +144,7 @@
        limit 1
    </select>

    <!--查询已报名培训公司未关联考试的人员-->
    <!--查询已报名培训公司未关联考试的报名信息-->
    <select id="getTrainIds" resultType="java.lang.Long">
        SELECT
        str.id