Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml

@@ -29,6 +29,9 @@
        <if test="recruitment.permit!=null">
            and sr.permit = #{recruitment.permit}
        </if>
        <if test="recruitment.deptId!=null">
            and sr.dept_id = #{recruitment.deptId}
        </if>
        <if test="recruitment.education!=null and recruitment.education!=''">
            and sr.education = #{recruitment.education}
        </if>