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/ComVeteransPopulationDO.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
@@ -75,9 +75,9 @@
        private String photo;

    /**
    * 户籍性质（1.城镇户口 2.农村户口）
     * 户籍性质
    */
        private Integer regiterNature;
    private String regiterNature;

    /**
    * 入伍时间
@@ -298,61 +298,26 @@

@Override
public String toString() {
        return "ComVeteransPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", personStatus=" + personStatus +
                ", organization=" + organization +
                ", photo=" + photo +
                ", regiterNature=" + regiterNature +
                ", enlistDate=" + enlistDate +
                ", retireDate=" + retireDate +
                ", personCategory=" + personCategory +
                ", houseSituation=" + houseSituation +
                ", houseSituationOther=" + houseSituationOther +
                ", buildArea=" + buildArea +
                ", employmentSituation=" + employmentSituation +
                ", incumbencyType=" + incumbencyType +
                ", employmentSituationOther=" + employmentSituationOther +
                ", endowmentInsurance=" + endowmentInsurance +
                ", medicalInsurance=" + medicalInsurance +
                ", annualIncome=" + annualIncome +
                ", fatherHealthy=" + fatherHealthy +
                ", motherHealthy=" + motherHealthy +
                ", spouseHealthy=" + spouseHealthy +
                ", sonHealthy=" + sonHealthy +
                ", daughterDealthy=" + daughterDealthy +
                ", mainDifficulty=" + mainDifficulty +
                ", otherDifficulty=" + otherDifficulty +
                ", mainDemand=" + mainDemand +
                ", mainDemandOther=" + mainDemandOther +
                ", academicTraining=" + academicTraining +
                ", isVeteransTraining=" + isVeteransTraining +
                ", educationBeforeEnlistment=" + educationBeforeEnlistment +
                ", reEducation=" + reEducation +
                ", major=" + major +
                ", majorOther=" + majorOther +
                ", onceEngagedIndustry=" + onceEngagedIndustry +
                ", onceEngagedIndustryOther=" + onceEngagedIndustryOther +
                ", intendedPlaceOfEmployment=" + intendedPlaceOfEmployment +
                ", intendedPlaceOfEmploymentOther=" + intendedPlaceOfEmploymentOther +
                ", unemploymedEngagedIndustry=" + unemploymedEngagedIndustry +
                ", unemploymedEngagedIndustryOther=" + unemploymedEngagedIndustryOther +
                ", isBusiness=" + isBusiness +
                ", businessDesire=" + businessDesire +
                ", remark=" + remark +
                ", fillUnit=" + fillUnit +
                ", fillPerson=" + fillPerson +
                ", fillPersonPhone=" + fillPersonPhone +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComVeteransPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", personStatus=" + personStatus + ", organization=" + organization + ", photo=" + photo
            + ", regiterNature=" + regiterNature + ", enlistDate=" + enlistDate + ", retireDate=" + retireDate
            + ", personCategory=" + personCategory + ", houseSituation=" + houseSituation + ", houseSituationOther="
            + houseSituationOther + ", buildArea=" + buildArea + ", employmentSituation=" + employmentSituation
            + ", incumbencyType=" + incumbencyType + ", employmentSituationOther=" + employmentSituationOther
            + ", endowmentInsurance=" + endowmentInsurance + ", medicalInsurance=" + medicalInsurance
            + ", annualIncome=" + annualIncome + ", fatherHealthy=" + fatherHealthy + ", motherHealthy=" + motherHealthy
            + ", spouseHealthy=" + spouseHealthy + ", sonHealthy=" + sonHealthy + ", daughterDealthy=" + daughterDealthy
            + ", mainDifficulty=" + mainDifficulty + ", otherDifficulty=" + otherDifficulty + ", mainDemand="
            + mainDemand + ", mainDemandOther=" + mainDemandOther + ", academicTraining=" + academicTraining
            + ", isVeteransTraining=" + isVeteransTraining + ", educationBeforeEnlistment=" + educationBeforeEnlistment
            + ", reEducation=" + reEducation + ", major=" + major + ", majorOther=" + majorOther
            + ", onceEngagedIndustry=" + onceEngagedIndustry + ", onceEngagedIndustryOther=" + onceEngagedIndustryOther
            + ", intendedPlaceOfEmployment=" + intendedPlaceOfEmployment + ", intendedPlaceOfEmploymentOther="
            + intendedPlaceOfEmploymentOther + ", unemploymedEngagedIndustry=" + unemploymedEngagedIndustry
            + ", unemploymedEngagedIndustryOther=" + unemploymedEngagedIndustryOther + ", isBusiness=" + isBusiness
            + ", businessDesire=" + businessDesire + ", remark=" + remark + ", fillUnit=" + fillUnit + ", fillPerson="
            + fillPerson + ", fillPersonPhone=" + fillPersonPhone + ", createAt=" + createAt + ", createBy=" + createBy
            + ", updateAt=" + updateAt + ", updateBy=" + updateBy + "}";
        }
        }