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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

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

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

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

    List<ManageMenu> getAllMenus();

    List getManageMenuByRoleId(int roleId);

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

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

    Map<String,Object> getManageMenuByCondition(Map map);

    Map<String,Object> getManageParentMenu(Map map);

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

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