Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

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

@@ -1107,7 +1107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
         c.company_id, c.company_name
         ORDER BY
-        c.company_id;
+        c.company_id
 
     </select>
     

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

@@ -246,7 +246,8 @@
     <update id="updateVideoByVideoUrl" >
         update fs_user_course_video set video_url = #{videoUrl},
                                         thumbnail = #{thumbnail},
-                                        file_name = #{fileName}
+                                        file_name = #{fileName},
+                                        title = #{fileName}
         where video_id in 
         <foreach item="videoId" collection="ids" open="(" separator="," close=")">
             #{videoId}