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/mapper/ManageMenuMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
index ddb40aa..7be6fae 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java
@@ -45,4 +45,8 @@
 
     void updateManageMenuById(Map map);
 
+    List<ManageMenu> getDataWithPage(Map map);
+
+    List<ManageMenu> getManageRoleByNameFuzzy(Map map);
+
 }

--
Gitblit v1.8.0