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

kaiyu

2021-05-24 52f100ec7860c781c1b44259c6c54b221a30c100

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

@@ -156,10 +156,10 @@
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了角色:"+manageRoleOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")){
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"角色名:"+manageRoleOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")){
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"备注:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
                }
            }