Merge branch 'online' into feature/1219_opt

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

@@ -96,7 +96,7 @@
         left join course_schedule_student_payment a on t.user_id_ = a.user_id_
         left join course_schedule b on a.course_id_ = b.id_
         LEFT JOIN course_group cg ON cg.id_ = b.course_group_id_
-        where b.lock_ = 0 AND cg.status_ IN ('COMPLETE','ING')
+        where b.lock_ = 0 AND cg.status_ IN ('COMPLETE','ING','APPLY')
             <if test="userId != null and userId != ''">
                 and t.user_id_ = #{userId}
             </if>