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

peng

4 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

 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;