1.合并冲突

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

@@ -642,7 +642,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         sysUserMapper.updateById(sysUser);
         try {
             // 注册IM
-            imGroupCoreService.register(String.valueOf(student.getUserId()),ClientEnum.STUDENT.getCode(), sysUser.getUsername(), avatar);
+            imGroupCoreService.register(String.valueOf(student.getUserId()),ClientEnum.STUDENT.getCode(),
+                    sysUser.getUsername(), sysUser.getAvatar());
         } catch (Exception e) {
             log.warn("学生注册IM失败："+e.getMessage());
         }