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

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

 screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java

@@ -120,7 +120,7 @@
    @RequestMapping(value = "getManageRoleByNameFuzzy", method = RequestMethod.GET)
    public ResultMessage getManageRoleByNameFuzzy(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        List<ManageRole> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
        Map<String,Object> re = manageRoleService.getManageRoleByNameFuzzy(parameters);
        return ResultMessage.ok(re);
    }