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

kaiyu

2021-04-16 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b

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

@@ -28,11 +28,15 @@
    @Transactional
    Map<String,Object> deleteManageMenu(Map map);

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

    List<ManageMenu> getAllMenus();

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);
    List getManageMenuByRoleId(int roleId);

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

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

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