From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

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

diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
index 5e9236d..6a0a421 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java
@@ -19,6 +19,6 @@
 public interface ManageRoleMenuService extends IService<ManageRoleMenu> {
 
     @Transactional
-    Map<String,Object> updateRoleMenu(List list,int id);
+    Map<String,Object> updateRoleMenu(List menuList,int id);
 
 }

--
Gitblit v1.8.0