From ebf94cb3ed4f487ca1fcd7069db0ca141553a4db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 六月 2025 17:52:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java | 4 ++++
1 files changed, 4 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 fbb0daa..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
@@ -2,6 +2,8 @@
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;
@@ -17,4 +19,6 @@
public interface TLeaveService extends IService<TLeave> {
PageInfo<LeaveListVO> pageList(LeaveListQuery query);
+
+ PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query);
}
--
Gitblit v1.7.1