From 64a91dc0c19b32a3f04380eb8401e9dd0987714f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 14 七月 2025 17:23:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'

---
 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index 8893835..d32c69c 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -18,5 +18,5 @@
 
     void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
 
-    List<StaffOnJob> staffOnJobList();
+    List<StaffJoinLeaveRecord> staffOnJobList();
 }

--
Gitblit v1.9.3