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/mapper/TLeaveMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TLeaveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TLeaveMapper.java
index c27b5a0..816f7bb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TLeaveMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TLeaveMapper.java
@@ -1,7 +1,15 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +21,9 @@
  */
 public interface TLeaveMapper extends BaseMapper<TLeave> {
 
+    List<LeaveListVO> pageList(@Param("query")LeaveListQuery query,@Param("pageInfo")PageInfo<LeaveListVO> pageInfo);
+
+    List<LeaveUserListVO> leaveList(@Param("query")LeaveListUserQuery query, @Param("pageInfo")PageInfo<LeaveUserListVO> pageInfo);
+
+
 }

--
Gitblit v1.7.1