Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-23 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14

 screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java

@@ -34,7 +34,9 @@

    List getManageMenuByRoleId(int roleId);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);
    List<Map<String,Object>> getManageMenuByNameFuzzy(Map map);

    List<Map<String,Object>> getManageMenuByParentId(Map map);

    List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles);
}