Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

buhuazhen

2025-08-29 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43

 main-business/src/main/resources/mapper/StaffOnJobMapper.xml

@@ -18,6 +18,7 @@
        <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
            AND contract_expire_time &lt;= to_date(#{staffOnJob.entryDateEnd},'YYYY-MM-DD')
        </if>
        order by create_time desc
    </select>
    <select id="staffOnJobList" resultType="com.ruoyi.business.entity.StaffOnJob">
        SELECT