From 653d67ef574c8ef1a64605f517f329eb6e6aec12 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 17:00:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOriginalHoursService.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOriginalHoursService.java b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOriginalHoursService.java
index 05dd08c..7623701 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOriginalHoursService.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOriginalHoursService.java
@@ -2,13 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.performance.dto.AuxiliaryAllDto;
import com.ruoyi.performance.dto.AuxiliaryOriginalHoursDto;
import com.ruoyi.performance.dto.AuxiliaryOriginalHoursLookDto;
-
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
public interface AuxiliaryOriginalHoursService {
@@ -20,11 +17,5 @@
*
* @param response
*/
- void exportWorkingHours(String month, String name, String departLims,HttpServletResponse response) throws IOException;
-
- /**
- * 鏌ヨ鏈堜唤鍏ㄩ儴宸ユ椂
- * @return
- */
- List<AuxiliaryAllDto> selectAuxiliaryAllByMonth(AuxiliaryOriginalHoursLookDto dto);
+ void exportWorkingHours(Page page,String month, String name, String departLims,HttpServletResponse response) throws IOException;
}
--
Gitblit v1.9.3