Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 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);

}