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

xiangpei

7 天以前 3c378a12577695f4de03fd2fbe83c033f1369c3f

 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java

@@ -633,7 +633,7 @@
        video.setAuthorId(UserContext.getCurrentUserId());
        video.setVideoType(VideoTypeEnum.HEALTH.getValue());
        //设置填充模式 保持比例，完整显示
        video.setVideoFit("contain");
        video.setVideoFit(form.getVideoFit());
        video.setVideoContentType(VideoContentTypeEnum.VIDEO.getValue());
        video.setStatus(VideoStatusEnum.PUBLISHED.getValue());
        baseMapper.insert(video);
@@ -690,7 +690,7 @@
        video.setAuthorId(UserContext.getCurrentUserId());
        video.setVideoType(VideoTypeEnum.COOK.getValue());
        //设置填充模式 保持比例，完整显示
        video.setVideoFit("contain");
        video.setVideoFit(form.getVideoFit());
        video.setVideoContentType(VideoContentTypeEnum.VIDEO.getValue());
        video.setStatus(VideoStatusEnum.PUBLISHED.getValue());
        baseMapper.insert(video);