Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -192,9 +192,10 @@
 			u.real_name_ AS realName,
 			p.pay_money_ AS payMoney,
 			p.order_no_ AS orderNo,
-			p.purchase_time_ AS purchaseTime
+			o.pay_time_ AS purchaseTime
 		FROM video_lesson_purchase_record p
 		LEFT JOIN sys_user u ON p.student_id_ = u.id_
+		LEFT JOIN user_order o ON p.order_no_ = o.order_no_
 		WHERE p.order_status_='PAID'
 			<if test="param.videoLessonGroupId !=null">
 				AND p.video_lesson_group_id_ = #{param.videoLessonGroupId}