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

huanghongfa

2021-08-31 49de13627ada2e6c7864691bf4d9a75f7d3a67f3

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

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.neighbor;

import java.util.Date;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther llming
@@ -26,13 +26,11 @@
    @ApiModelProperty("评论用户")
    private String userName;


    @ApiModelProperty("评论用户手机号")
    private String userPhone;

    @ApiModelProperty("评论时间")
    private Date createAt;


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