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/OaApprovalFlowNodeService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalFlowNodeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalFlowNodeService.java
index 17afc7d..1bc3f15 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalFlowNodeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalFlowNodeService.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.OaApprovalFlowNode;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,5 @@
*/
public interface OaApprovalFlowNodeService extends IService<OaApprovalFlowNode> {
+ List<OaApprovalFlowNode> pageList(ApprovalNodeListQuery query);
}
--
Gitblit v1.7.1