Merge branch 'fix/0618' into test

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

@@ -213,6 +213,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == detail) {
             detail = new TeacherVo();
         }
+        if (detail.getDefaultSubject() == null && StringUtils.isNotBlank(detail.getSubjectId())) {
+            detail.setDefaultSubject(Long.parseLong(detail.getSubjectId().split(",")[0]));
+        }
+
         int num = DateUtil.daysBetween(new Date(), detail.getMembershipEndTime());
         detail.setMembershipDays(Math.max(num, 0));
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);