Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

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

@@ -45,9 +45,16 @@
    @ApiModelProperty("评论人名字")
    private String userName;

    @ApiModelProperty("评论人昵称")
    private String userNickName;

    @ApiModelProperty("回复人名字")
    private String userNameBack;

    @ApiModelProperty("回复人昵称")
    private String userNickNameBack;


    @ApiModelProperty("评论人手机号")
    private String phone;