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

zouyu

4 天以前 c43ec56912aa1a5a711dc31c059324e43061964c

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

@@ -16,6 +16,7 @@
        <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
            and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
        </if>
        order by create_time desc
    </select>
    <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
        SELECT