Merge remote-tracking branch 'origin/master'

zengh

2021-08-12 642414e16907bdd2a47642a9a83c1bc002c6b081

 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml

@@ -122,6 +122,9 @@
        <if test="paper.examName!=null and paper.examName!=''">
            and exam_name like concat('%', #{paper.examName},'%')
        </if>
        <if test="paper.examType!=null">
            and exam_type = #{paper.examType}
        </if>
    </select>

    <delete id="UnbindSubject">