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

zxl

10 天以前 09c1e21cad0b474babb1d2f67f481b582adf0b0f

 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;