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/ComKeyPopulationVO.java

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

import java.util.Date;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;

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

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


/**
 * @auther txb
@@ -24,79 +23,79 @@
public class ComKeyPopulationVO {

    /**
    * 主键id
    */
     * 主键id
     */
    @ApiModelProperty("重点上访人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
     * 人口id
     */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
     * 街道id
     */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
     * 社区id
     */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
     * 名字
     */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
     * 身份证号码
     */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
     * 联系电话
     */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 备注
    */
     * 备注
     */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
     * 创建用户
     */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
     * 修改用户
     */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}