From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java
index 893db30..387089a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java
@@ -4,6 +4,7 @@
import com.ruoyi.system.model.OaApproval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.ApprovalListQuery;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.vo.system.ApprovalVO;
import org.apache.ibatis.annotations.Param;
@@ -19,6 +20,6 @@
*/
public interface OaApprovalMapper extends BaseMapper<OaApproval> {
- List<ApprovalVO> pageList(@Param("query")ApprovalListQuery query, @Param("pageInfo")PageInfo<ApprovalVO> pageInfo);
+ List<ApprovalVO> pageList(@Param("query") ApprovalListQuery query, @Param("pageInfo")PageInfo<ApprovalVO> pageInfo);
}
--
Gitblit v1.7.1