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

peng

3 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

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

@@ -85,10 +85,18 @@
    /** 评论数 */
    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;