Merge remote-tracking branch 'origin/master'

maven

昨天 9fb6f5adf9f63deffd377c001aaab8ffeae4c742

 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();

}