Merge remote-tracking branch 'origin/master'

Null

2021-03-18 f2d86046f9b5a122e7593a95b6ff3ce911ac98b6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java

@@ -57,6 +57,9 @@
    @ApiModelProperty("点赞数量")
    private Integer num;

    @ApiModelProperty("是否点赞 1 是 0 否")
    private Integer haveSign;

    @ApiModelProperty("回复内容")
    private String commentBack;