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

kaiyu

2021-04-25 616dca8f5bbb17f0b3a124340965c0232fdae894

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

@@ -105,8 +105,8 @@
            return resultMap;
        }
        if (manageRoleMapper.getManageRoleByName(manageRole.getName()) != null){
            resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXPIRE.getCode());
            resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXPIRE.getMsg());
            resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXIST.getCode());
            resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
            return resultMap;
        }
        manageRoleMapper.insertOne(manageRole);