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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalService.java
index be21bc1..55802d4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalService.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.OaApproval;
 import com.ruoyi.system.query.ApprovalListQuery;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
 import com.ruoyi.system.vo.system.ApprovalVO;
 
 /**

--
Gitblit v1.7.1