Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -447,7 +447,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     List<WatchLogDTO> selectFsCourseWatchLog30DayByExtId(@Param("extId") Long extId);
 
     @Select("SELECT * FROM fs_course_watch_log " +
-            "WHERE log_type = 2 AND send_finish_msg = 0 " +
+            "WHERE log_type = 2 AND send_finish_msg = 0 and send_type = 2 " +
             "AND send_type = 2 and finish_time >= #{startDate} AND finish_time < #{endDate} and log_id > #{maxId} order by log_id asc  " +
             "LIMIT #{limit}")
     List<FsCourseWatchLog> selectFsCourseWatchLogFinishBatchByDate(