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

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

@@ -587,17 +587,11 @@
             AND ts.status_ = #{param.salaryStatus}
         </if>
         <if test="param.startTime != null">
-            AND cs.start_time_ &lt;= #{param.startTime}
+            AND cs.class_date_ BETWEEN #{param.startTime} AND #{param.endTime}
         </if>
         <if test="param.search != null and param.search != ''">
             AND cs.id_ = #{param.search}
         </if>
-        <if test="param.endTime != null">
-            AND cs.end_time_ &gt;= #{param.endTime}
-        </if>
-        <if test="param.endTime != null">
-            AND cs.id_ LIKE concat('%',#{param.courseId},'%')
-        </if>
     </select>
     <select id="selectVideoGroup" resultType="com.yonge.cooleshow.biz.dal.vo.CourseGroupVideoVo">
         SELECT