Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -56,8 +56,8 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
             List<BasicUserInfo> basicUserInfos = basicUserInfoMap.get(studentId);
             if(CollectionUtils.isNotEmpty(basicUserInfos)){
                 BasicUserInfo info = basicUserInfos.get(0);
-                teacherFriend.setFriendAvatar(info.getAvatar());
-                teacherFriend.setFriendNickname(info.getUsername());
+                teacherFriend.setFriendAvatar(basicUserInfo.getAvatar());
+                teacherFriend.setFriendNickname(basicUserInfo.getUsername());
                 studentFriend.setFriendAvatar(info.getAvatar());
                 studentFriend.setFriendNickname(info.getUsername());
             }