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/dao/system/SystemMenuMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
index 02b695d..f5ba1b9 100644
--- a/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
@@ -13,14 +13,14 @@
* @author Eva.Caesar Liu
* @date 2023/02/14 11:14
*/
- List<SystemMenuListVO> selectManageList();
+ List<SystemMenuListVO> selectManageList(Integer type);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ
* @author Eva.Caesar Liu
* @date 2023/02/14 11:14
*/
- List<SystemMenu> selectByUserId(Integer userId);
+ List<SystemMenu> selectByUserId(Integer userId,Integer type);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ
--
Gitblit v1.9.3