Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -3433,7 +3433,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                         .eq(UserStudyVideo::getStatus,1));
                                 if (ObjectUtils.isNotNull(studyVideo)){
                                     classPeriodSectionVo.setVideoUrl(studyVideo.getVideoUrl());
-                                    classPeriodSectionVo.setVideoTime(DateUtils.timestampToDateFormat(studyVideo.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+                                    classPeriodSectionVo.setVideoTime(DateUtils.timestampToDateFormat(studyVideo.getUpdateTime(),"yyyy-MM-dd HH:mm:ss"));
                                     classPeriodSectionVo.setVideoCurrentTime(studyVideo.getVideoCurrentTime());
                                 }
                                 sectionTotal++;

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

@@ -1716,6 +1716,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         video.setVideoCurrentTime(bo.getVideoCurrentTime());
         video.setFromPlat(bo.getFromPlat());
         video.setVideoUrl(bo.getVideoUrl());
+        video.setUpdateTime(DateUtils.getNowTime());
         return iUserStudyVideoService.updateById(video);
     }