From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java b/screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java
index 82bee80..bab03f0 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java
@@ -15,6 +15,7 @@
*/
public interface MenuMapper extends BaseMapper<Menu> {
- List<Menu> selectUserMenu(int userId);
+ List<Menu> selectUserMenu(Integer userId);
+ List<Menu> selectOrganizationMenu(Integer orgId);
}
--
Gitblit v1.8.0