From e56c1cce484cd8df8c3373d4e2b5847d11b09abe Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 23 九月 2025 14:08:10 +0800 Subject: [PATCH] 代码合并解决冲突 bug修改 --- ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalTodoService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalTodoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalTodoService.java index 909fea6..6d4a31e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalTodoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalTodoService.java @@ -30,4 +30,6 @@ PageInfo<OaApprovalTodo> pageList(ApprovalTodoListQuery query); + + PageInfo<OaApprovalTodo> pageListAudit(ApprovalTodoListQuery query); } -- Gitblit v1.7.1