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

manailin

2021-06-27 76ed3735c23da4b7ef97b8a0f365facbc14f6903

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

@@ -61,6 +61,9 @@
    @ApiModelProperty("发布人名字")
    private String userName;

    @ApiModelProperty("发布人昵称")
    private String userNickName;

    @ApiModelProperty("发布人头像")
    private String imageUrl;