Merge branch 'master' into pim_zss

zss

2025-09-22 bc041bbe418b340af60fafd1c4e15463624e96e3

 src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java

@@ -18,4 +18,7 @@
    IPage<StaffJoinLeaveRecord> staffJoinLeaveRecordListPage(Page page, @Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);

    List<StaffJoinLeaveRecord> staffJoinLeaveRecordList(@Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);

    List<StaffJoinLeaveRecord> staffOnJobList();

}