Merge remote-tracking branch 'origin/master'

maven

2025-09-23 0781900bd070feada6be1b7f926696691d03ff53

 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