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

kaiyu

2021-06-18 4ad67c20b9c5e6625babefeee59ccee155cfc3aa

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

@@ -38,6 +38,10 @@

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