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

xyh

2021-06-18 aa9d5899deda2c9a9c4da111e89509136f1c4ec2

 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;