From 0d564acb20296f5f289d0fedfc1b09ef421892a3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_zss' into pim_ywx
---
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