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/mapper/TLeaveMapper.java | 6 ++++++
1 files changed, 6 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 890945a..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
@@ -2,6 +2,8 @@
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;
@@ -20,4 +22,8 @@
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