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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,13 +1,15 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import org.springframework.format.annotation.DateTimeFormat;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,7 +27,7 @@
    @ApiModelProperty(value = "主键")
    private Long id;
    /**
     * 状态  0待审核 1已上架 2已驳回 3已下架
     * 状态 0待审核 1已上架 2已驳回 3已下架
     */
    @ApiModelProperty(value = "状态  0待审核 1已上架 2已驳回 3已下架")
    private Integer status;
@@ -144,7 +146,6 @@
     */
    @ApiModelProperty(value = "审核人id")
    private Long approveBy;


    /**
     * create_at