From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java | 5 ++++-
1 files changed, 4 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..2cef9f2 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -18,5 +19,7 @@
void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
- List<StaffOnJob> staffOnJobList();
+ List<StaffJoinLeaveRecord> staffOnJobList();
+
+ Boolean importData(MultipartFile file);
}
--
Gitblit v1.9.3