From 1ec0374d08be45c6c6854705211dbd6c067dfab7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 17:23:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
index 91084c0..8b237d7 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
@@ -19,7 +19,7 @@
 public interface ManageRoleService extends IService<ManageRole> {
 
     @Transactional
-    List<ManageRole> getAll();
+    List<ManageRole> getAllWithPagingQuery(Map map);
 
     @Transactional
     Map<String,Object> insertOne(ManageRole manageRole,List list);
@@ -28,7 +28,7 @@
     Map<String,Object> updateManageRole(Map map);
 
     @Transactional
-    List<ManageRole> getManageRoleByNameFuzzy(ManageRole manageRole);
+    List<ManageRole> getManageRoleByNameFuzzy(Map map);
 
     @Transactional
     Map<String,Object> deleteManageRole(Map map);

--
Gitblit v1.8.0