Merge branch 'feature/0621-member' into online

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

@@ -238,12 +238,6 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
             lessonStudentVo.setTeacherFlag(teacher.getTeacherFlag());
             lessonStudentVo.setDegreeFlag(teacher.getDegreeFlag());
         }
-
-        VideoLessonGroup videoLessonGroup = videoLessonGroupDao.selectGroupById(groupId);
-        if (videoLessonGroup != null) {
-            videoLessonGroupVo.setPayType(videoLessonGroup.getPayType());
-        }
-
         lessonStudentVo.setLessonGroup(videoLessonGroupVo);
 
         VideoLessonSearch search = new VideoLessonSearch();

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupLogMapper.xml

@@ -11,7 +11,7 @@
 		<result column="lesson_subject_" property="lessonSubject" />
 		<result column="lesson_desc_" property="lessonDesc" />
 		<result column="lesson_price_" property="lessonPrice" />
-		<result column="pay_tpye_" property="payType" />
+		<result column="pay_type_" property="payType" />
 		<result column="lesson_cover_url_" property="lessonCoverUrl" />
 		<result column="teacher_id_" property="teacherId" />
 		<result column="lesson_count_" property="lessonCount" />