Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.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
@@ -62,7 +62,7 @@
    /**
    * 与人员关系
    */
    private Integer patientRelation;
    private String patientRelation;

    /**
    * 列管原因及类型
@@ -188,39 +188,16 @@

@Override
public String toString() {
        return "ComRehabilitationPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", patientRelation=" + patientRelation +
                ", rehabReasonAndType=" + rehabReasonAndType +
                ", isRehab=" + isRehab +
                ", isRecidivist=" + isRecidivist +
                ", originalTerm=" + originalTerm +
                ", sentenceBegin=" + sentenceBegin +
                ", originalCharge=" + originalCharge +
                ", sentenceEnd=" + sentenceEnd +
                ", sentencePlace=" + sentencePlace +
                ", riskAssessment=" + riskAssessment +
                ", joinDate=" + joinDate +
                ", joinSituation=" + joinSituation +
                ", isAgainCrime=" + isAgainCrime +
                ", againCrimeName=" + againCrimeName +
                ", placeSituation=" + placeSituation +
                ", placeDate=" + placeDate +
                ", notPlaceReason=" + notPlaceReason +
                ", helpBegin=" + helpBegin +
                ", helpEnd=" + helpEnd +
                ", helpSituation=" + helpSituation +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComRehabilitationPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId="
            + streetId + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", patientRelation=" + patientRelation + ", rehabReasonAndType=" + rehabReasonAndType + ", isRehab="
            + isRehab + ", isRecidivist=" + isRecidivist + ", originalTerm=" + originalTerm + ", sentenceBegin="
            + sentenceBegin + ", originalCharge=" + originalCharge + ", sentenceEnd=" + sentenceEnd + ", sentencePlace="
            + sentencePlace + ", riskAssessment=" + riskAssessment + ", joinDate=" + joinDate + ", joinSituation="
            + joinSituation + ", isAgainCrime=" + isAgainCrime + ", againCrimeName=" + againCrimeName
            + ", placeSituation=" + placeSituation + ", placeDate=" + placeDate + ", notPlaceReason=" + notPlaceReason
            + ", helpBegin=" + helpBegin + ", helpEnd=" + helpEnd + ", helpSituation=" + helpSituation + ", remark="
            + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy="
            + updateBy + "}";
        }
        }