From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 12 七月 2025 14:42:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java index d400160..6e603a1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java @@ -1,7 +1,12 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.system.applet.query.LeaveListUserQuery; +import com.ruoyi.system.applet.vo.LeaveUserListVO; import com.ruoyi.system.model.TLeave; +import com.ruoyi.system.query.LeaveListQuery; +import com.ruoyi.system.vo.system.LeaveListVO; /** * <p> @@ -13,4 +18,7 @@ */ public interface TLeaveService extends IService<TLeave> { + PageInfo<LeaveListVO> pageList(LeaveListQuery query); + + PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query); } -- Gitblit v1.7.1