Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1264,6 +1264,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             }
 
             FsCourseWatchLog updateLog = new FsCourseWatchLog();
+            updateLog.setLogId(watchCourseVideo.getLogId());
             updateLog.setPeriodId(param.getPeriodId());
             updateLog.setProject(courseProject);
             updateLog.setUpdateTime(new Date());