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/ComCorrectPopulationDO.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
@@ -197,7 +197,7 @@
    /**
    * 学历
    */
    private Integer cultureLevel;
    private String cultureLevel;

    /**
    * 社区矫正人员编号
@@ -238,49 +238,21 @@

@Override
public String toString() {
        return "ComCorrectPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", correctType=" + correctType +
                ", correctBegin=" + correctBegin +
                ", correctEnd=" + correctEnd +
                ", receiveMethod=" + receiveMethod +
                ", isRecidivist=" + isRecidivist +
                ", fourHistory=" + fourHistory +
                ", threeInvovle=" + threeInvovle +
                ", isCorrectGroup=" + isCorrectGroup +
                ", correctGroupConstitute=" + correctGroupConstitute +
                ", correctRelieveType=" + correctRelieveType +
                ", isOutControl=" + isOutControl +
                ", outControlReason=" + outControlReason +
                ", outControlCorrect=" + outControlCorrect +
                ", inspectOutControl=" + inspectOutControl +
                ", isMissControl=" + isMissControl +
                ", missControlReason=" + missControlReason +
                ", missControlCorrect=" + missControlCorrect +
                ", inspectMissControl=" + inspectMissControl +
                ", rewardAndPunishiment=" + rewardAndPunishiment +
                ", isAgainCrime=" + isAgainCrime +
                ", againCrimeName=" + againCrimeName +
                ", pubishmentChange=" + pubishmentChange +
                ", caseType=" + caseType +
                ", specificCharge=" + specificCharge +
                ", originalTerm=" + originalTerm +
                ", originalTermBegin=" + originalTermBegin +
                ", originalTermEnd=" + originalTermEnd +
                ", cultureLevel=" + cultureLevel +
                ", correctPersonCode=" + correctPersonCode +
                ", originalCustodyplace=" + originalCustodyplace +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComCorrectPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", correctType=" + correctType + ", correctBegin=" + correctBegin + ", correctEnd=" + correctEnd
            + ", receiveMethod=" + receiveMethod + ", isRecidivist=" + isRecidivist + ", fourHistory=" + fourHistory
            + ", threeInvovle=" + threeInvovle + ", isCorrectGroup=" + isCorrectGroup + ", correctGroupConstitute="
            + correctGroupConstitute + ", correctRelieveType=" + correctRelieveType + ", isOutControl=" + isOutControl
            + ", outControlReason=" + outControlReason + ", outControlCorrect=" + outControlCorrect
            + ", inspectOutControl=" + inspectOutControl + ", isMissControl=" + isMissControl + ", missControlReason="
            + missControlReason + ", missControlCorrect=" + missControlCorrect + ", inspectMissControl="
            + inspectMissControl + ", rewardAndPunishiment=" + rewardAndPunishiment + ", isAgainCrime=" + isAgainCrime
            + ", againCrimeName=" + againCrimeName + ", pubishmentChange=" + pubishmentChange + ", caseType=" + caseType
            + ", specificCharge=" + specificCharge + ", originalTerm=" + originalTerm + ", originalTermBegin="
            + originalTermBegin + ", originalTermEnd=" + originalTermEnd + ", cultureLevel=" + cultureLevel
            + ", correctPersonCode=" + correctPersonCode + ", originalCustodyplace=" + originalCustodyplace
            + ", remark=" + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt
            + ", updateBy=" + updateBy + "}";
        }
        }