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

peng

3 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java

@@ -89,6 +89,10 @@
    @ApiModelProperty("评论数")
    private Integer commentNum;

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

    /** 权重 */
    @ApiModelProperty("权重")
    private double weight;