Merge branch 'dev_1_3_3_20220822' into online

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

@@ -322,7 +322,7 @@
 	
 	<select id="queryMyLessonGroup" resultType="com.yonge.cooleshow.biz.dal.vo.LessonGroupVo">
 		SELECT
-			g.id_ AS id,
+			g.video_lesson_group_id_ AS id,
 			g.lesson_name_ AS lessonName,
 			g.lesson_subject_ AS lessonSubject,
 			s.name_ AS lessonSubjectName,

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

@@ -31,6 +31,6 @@
 	</update>
 	
 	<select id="queryByVideoLessonGroupId" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson_group WHERE video_lesson_group_id_ = #{videoLessonGroupId} and order_status_  = #{orderStatus}
+		SELECT * FROM video_lesson_purchase_record WHERE video_lesson_group_id_ = #{videoLessonGroupId} and order_status_  = #{orderStatus}
 	</select>
 </mapper>