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

huanghongfa

2021-06-16 602f2f840be38c1cf38e78d2d5b50fd44effaa08

 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;