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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -34,6 +34,8 @@

    List getManageMenuByRoleId(int roleId);

    List getManageChildMenuByRoleId(int roleId);

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

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