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

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

@@ -448,6 +448,9 @@
 			<if test="param.endTime !=null">
 				<![CDATA[AND g.create_time_ <= #{param.endTime} ]]>
 			</if>
+			<if test="param.payType != null">
+				AND g.pay_type_ = #{param.payType}
+			</if>
 		</where>
 		ORDER BY g.update_time_ desc, g.id_ desc
 	</select>