Merge remote-tracking branch 'origin/master'

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

fs-service/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -72,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_course_traffic_log
         <where>
-            create_time  &gt;= CURDATE()
-            AND create_time &lt; CURDATE() + INTERVAL 1 DAY
+            create_time  &gt;= CURDATE() - INTERVAL 1 DAY
+            AND create_time &lt; CURDATE()
             <if test="companyId != null">
                 AND company_id = ${companyId}
             </if>