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

huanghongfa

2021-08-13 c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java

@@ -24,7 +24,7 @@
    private Integer fabulousNum;

    @ApiModelProperty("评论用户")
    private Long userName;
    private String userName;


    @ApiModelProperty("评论用户手机号")
@@ -33,4 +33,8 @@
    @ApiModelProperty("评论时间")
    private Date createAt;


    @ApiModelProperty("状态（1.显示 2.隐藏）")
    private Integer status;

}