Merge remote-tracking branch 'origin/jtwy' into jtwy

yaowanxin

昨天 2be90eb75452c8f0820d89cb1cd018dd86a351e0

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

}