Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

@@ -56,7 +56,7 @@
    private String userAvatar;

    @ApiModelProperty("评论点赞数")
    private Long thumbsUpNum;
    private Integer thumbsUpNum;

    @ApiModelProperty("主评论下面总共有多少条回复")
    private Long replyTotalCount;