Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 33f9eae4ad4321860e4881f5f38dad6368c878ef

 src/main/resources/mapper/staff/StaffLeaveMapper.xml

@@ -35,6 +35,7 @@
        <if test="c.staffName != null and c.staffName != '' ">
            AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
        </if>
        order by staff_leave.id desc
    </select>
    <select id="staffLeaveList" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
        SELECT