merge

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

@@ -156,15 +156,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SmsCodeService smsCodeService;
 
 
-<<<<<<< Updated upstream
-=======
-    @Autowired
-    private ImGroupCoreService imGroupCoreService;
-
-    @Autowired
-    private RealnameAuthenticationPlugin realnameAuthenticationPlugin;
-
->>>>>>> Stashed changes
     @Override
     public TeacherVo detail(Long userId) {
         TeacherVo detail = baseMapper.detail(userId);