Merge branch 'feature/0621-member' into develop-new

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/VideoLessonGroupMapper.xml

@@ -340,6 +340,7 @@
 			g.lesson_subject_ AS lessonSubject,
 			s.name_ AS lessonSubjectName,
 			g.lesson_desc_ AS lessonDesc,
+			g.pay_type_ AS payType,
 			g.lesson_price_ AS lessonPrice,
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.lesson_count_ AS lessonCount,