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

peng

2 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/Video.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import lombok.Data;

/**
@@ -35,13 +37,25 @@
    /** 视频填充模式 */
    private String videoFit;

    @TableField("video_duration")
    /** 视频长度(秒) */
    private Long videoDuration;

    @TableField("title")
    /** 视频标题 */
    private String title;

    @TableField("goods_id")
    /** 商品id */
    private String goodsId;
    @TableField("video_content_type")
    /** 视频内容类型：视频、图片 */
    private String videoContentType;

    @TableField("video_type")
    /** 视频类型：视频、大健康、神厨 */
    private String videoType;

    @TableField("video_imgs")
    /** 图片地址（json数组），对应video_type = 图片 */
    private String videoImgs;

    @TableField("goods_view_num")
    /** 商品查看次数 */
@@ -61,15 +75,31 @@

    @TableField("play_num")
    /** 播放量 */
    private Long playNum;
    private Integer playNum;

    @TableField("collect_num")
    /** 收藏数 */
    private Long collectNum;
    private Integer collectNum;

    @TableField("comment_num")
    /** 评论数 */
    private Long commentNum;
    private Integer commentNum;

    @TableField("thumbs_up_num")
    /** 点赞数 */
    private Integer thumbsUpNum;

    @TableField("collect_num_job")
    /** 是否需要定时任务统计收藏数 */
    private Boolean collectNumJob;

    @TableField("thumbs_up_num_job")
    /** 是否需要定时任务统计点赞数 */
    private Boolean thumbsUpNumJob;

    @TableField("comment_num_job")
    /** 是否需要定时任务统计评论数 */
    private Boolean commentNumJob;

    @TableField("weight")
    /** 权重 */
@@ -77,7 +107,7 @@

    @TableField("audit_pass_time")
    /** 审核通过时间 */
    private LocalDateTime auditPassTime;
    private Date auditPassTime;


}