From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc

---
 src/main/java/org/springblade/modules/attendance/service/IAttendanceService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/attendance/service/IAttendanceService.java b/src/main/java/org/springblade/modules/attendance/service/IAttendanceService.java
index d03fbc3..816f2b7 100644
--- a/src/main/java/org/springblade/modules/attendance/service/IAttendanceService.java
+++ b/src/main/java/org/springblade/modules/attendance/service/IAttendanceService.java
@@ -39,13 +39,15 @@
 	 * @param attendance
 	 * @return
 	 */
-	IPage<Attendance> selectAttendancePage(IPage<Attendance> page, Long department, AttendanceVO attendance);
+	IPage<AttendanceVO> selectAttendancePage(IPage<AttendanceVO> page, AttendanceVO attendance);
+
+
 	/**
-	 * 导出用户数据
+	 * 导出考勤数据
 	 *
 	 * @return
 	 */
-	List<AttendanceExcel> exportAttendane(String name,String beginTimes,String endTimes,String attendancetypes);
+	List<AttendanceExcel> exportAttendane(AttendanceVO attendance);
 
 	/**
 	 * 查询当前考勤人员当天的考勤信息

--
Gitblit v1.9.3