From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
index 8234f66..f47b9ac 100644
--- a/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
+++ b/server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
@@ -40,14 +40,14 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuNodeVO> findTree(Integer userId);
+ List<SystemMenuNodeVO> findTree(Integer userId,Integer type);
/**
* 鏌ヨ鑿滃崟鍒楄〃鏍�
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findTree();
+ List<SystemMenuListVO> findTreeByType(Integer type);
/**
* 鍒犻櫎
--
Gitblit v1.9.3