openim分支合并

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -309,8 +309,8 @@ public class FsUserCourseVideoController extends AppBaseController {
         BeanUtils.copyProperties(fsCourseWatchAppParam, param);
         param.setCompanyUserId(Long.parseLong(getUserId()));
         param.setCompanyId(getCompanyId());
-        param.setSTime(DateUtil.beginOfDay(new Date()));
-        param.setETime(DateUtil.endOfDay(new Date()));
+        param.setSTime(DateUtil.formatDate(DateUtil.beginOfDay(new Date())));
+        param.setETime(DateUtil.formatDate(DateUtil.endOfDay(new Date())));
 //        startPage();
         PageHelper.startPage(fsCourseWatchAppParam.getPageNum (), fsCourseWatchAppParam.getPageSize());
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);