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/ComMajorPopulationDO.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
@@ -77,7 +77,7 @@
    /**
    * 与监护人关系
    */
    private Integer custodyRelation;
    private String custodyRelation;

    /**
    * 监护人公民身份号码
@@ -148,31 +148,14 @@

@Override
public String toString() {
        return "ComMajorPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", economicCondition=" + economicCondition +
                ", personType=" + personType +
                ", familySituation=" + familySituation +
                ", custodyPerson=" + custodyPerson +
                ", custodyRelation=" + custodyRelation +
                ", custodyCardNo=" + custodyCardNo +
                ", custodyPersonPhone=" + custodyPersonPhone +
                ", custodyAddress=" + custodyAddress +
                ", helpPerson=" + helpPerson +
                ", helpPersonPhone=" + helpPersonPhone +
                ", helpMethod=" + helpMethod +
                ", helpSituation=" + helpSituation +
                ", isCrime=" + isCrime +
                ", crimeSutiation=" + crimeSutiation +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComMajorPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", economicCondition="
            + economicCondition + ", personType=" + personType + ", familySituation=" + familySituation
            + ", custodyPerson=" + custodyPerson + ", custodyRelation=" + custodyRelation + ", custodyCardNo="
            + custodyCardNo + ", custodyPersonPhone=" + custodyPersonPhone + ", custodyAddress=" + custodyAddress
            + ", helpPerson=" + helpPerson + ", helpPersonPhone=" + helpPersonPhone + ", helpMethod=" + helpMethod
            + ", helpSituation=" + helpSituation + ", isCrime=" + isCrime + ", crimeSutiation=" + crimeSutiation
            + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy=" + updateBy
            + "}";
        }
        }