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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSentencePopulationDO.java

@@ -1,13 +1,13 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;

import lombok.Data;

/**
 * @auther txb
@@ -23,108 +23,95 @@
    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
     * 人口id
     */
    private Long populationId;

    /**
    * 街道id
    */
     * 街道id
     */
    private Long streetId;

    /**
    * 社区id
    */
     * 社区id
     */
    private Long communityId;

    /**
    * 名字
    */
     * 名字
     */
    private String name;

    /**
    * 身份证号码
    */
     * 身份证号码
     */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
     * 联系电话
     */
    private String phone;

    /**
    * 配偶
    */
     * 配偶
     */
    private String spouse;

    /**
    * 服刑开始时间
    */
     * 服刑开始时间
     */
    private Date sentenceBegin;

    /**
    * 服刑结束时间
    */
     * 服刑结束时间
     */
    private Date sentenceEnd;

    /**
    * 罪名
    */
     * 罪名
     */
    private String charge;

    /**
    * 备注
    */
     * 备注
     */
    private String remark;

    /**
    * 创建时间
    */
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
     * 创建用户
     */
    private Long createBy;

    /**
    * 修改时间
    */
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
     * 修改用户
     */
    private Long updateBy;

@Override
public String toString() {
        return "ComSentencePopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", spouse=" + spouse +
                ", sentenceBegin=" + sentenceBegin +
                ", sentenceEnd=" + sentenceEnd +
                ", charge=" + charge +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }
    @Override
    public String toString() {
        return "ComSentencePopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", spouse=" + spouse + ", sentenceBegin=" + sentenceBegin + ", sentenceEnd=" + sentenceEnd + ", charge="
            + charge + ", remark=" + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt="
            + updateAt + ", updateBy=" + updateBy + "}";
    }
}