Merge remote-tracking branch 'origin/pim_yys'

maven

2025-08-12 acd5c596b40b44e3ac3624a9cde7f62a1be6a076

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -51,8 +51,8 @@
    }

    @Override
    public List<StaffOnJob> staffOnJobList() {
        return staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffState,1));
    public List<StaffJoinLeaveRecord> staffOnJobList() {
        return staffJoinLeaveRecordMapper.staffOnJobList();
    }