From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/MenuMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/MenuMapper.java b/src/main/java/com/moral/mapper/MenuMapper.java
index 3f288d5..a1a2d6b 100644
--- a/src/main/java/com/moral/mapper/MenuMapper.java
+++ b/src/main/java/com/moral/mapper/MenuMapper.java
@@ -20,6 +20,8 @@
List<Menu> getParentMenuList(@Param("menuName") String menuName);
- List<Menu> getMenuListByName(@Param("menuName") String menuName);
+ List<Menu> getMenuListInfo();
+
+ List<Integer> getMenuOrdersByRoleId(@Param("roleId") Integer roleId);
}
--
Gitblit v1.8.0