From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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