Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -273,6 +273,8 @@ public class MsgBiz {
                 BeanUtil.copyProperties(msg, msgVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 //添加用户昵称和头像
                 ImiVo imiVo = userBiz.getUserInfo(msg.getUserId());
+                log.info("获取用户头像和昵称 : 用户ID>>> {}", msg.getUserId());
+                log.info("获取用户头像和昵称 : imiVo>>> {}", imiVo);
                 if (imiVo != null) {
                     msgVo.setNickname(imiVo.getNickname());
                     msgVo.setPicUrl(imiVo.getHeadimgurl());