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/service/MenuService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/MenuService.java b/src/main/java/com/moral/service/MenuService.java
index bb01354..59fa77e 100644
--- a/src/main/java/com/moral/service/MenuService.java
+++ b/src/main/java/com/moral/service/MenuService.java
@@ -8,8 +8,6 @@
public interface MenuService {
void addOrModify(Menu menu);
- PageBean queryByPageBean(PageBean pageBean);
-
PageBean queryByAllPageBean(PageBean pageBean);
int countByExample(PageBean pageBean);
@@ -20,5 +18,7 @@
void deleteByIds(Integer[] ids);
- List<Menu> getMenuListByName(String menuName);
+ List<Menu> getZNodes();
+
+ List<Integer> getMenuOrders(Integer roleId);
}
--
Gitblit v1.8.0