Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -603,6 +603,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         return 0;
                     }
                 }else{
+                    if (bo.getVideoCurrentTime() > 15 ){
+                        //防止拿到上一个视频的播放时间点
+                        add.setVideoCreateTime(0L);
+                    }
                     add.setVideoCheckTime(add.getVideoCurrentTime());
                     add.setVideoCreateTime(DateUtils.getNowTime());
                     this.save(add);