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

zxl

7 天以前 3fdceb6011f62d5d2a9d26f5f840f75055506226

 framework/src/main/java/cn/lili/modules/lmk/domain/form/VideoCommentForm.java

@@ -43,6 +43,9 @@
    @ApiModelProperty("回复的人昵称")
    private String replyUserNickname;

    @ApiModelProperty("回复的人头像")
    private String replyUserAvatar;

    @ApiModelProperty("主评论id，可从reply的评论上获取到")
    private String masterCommentId;