1.合并冲突

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

@@ -474,11 +474,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (StringUtils.isEmpty(sysUser.getUsername())) {
             sysUser.setUsername("游客" + sysUser.getId());
         }
-        //设置默认头像
-        if (StringUtil.isEmpty(sysUser.getAvatar())) {
-            String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.TEACHER_AVATAR);
-            sysUser.setAvatar(defaultHeard);
-        }
         employeeDao.updateSysUser(sysUser);
         return sysUser;
     }