Merge branch 'pim_ywx'

yaowanxin

2025-09-26 eb326e7fcfa56f209038f66434bbb6476db7ebae

 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