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/ComDrugPopulationDO.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
@@ -143,30 +143,13 @@

@Override
public String toString() {
        return "ComDrugPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", firstDate=" + firstDate +
                ", controlSituation=" + controlSituation +
                ", controlPerson=" + controlPerson +
                ", controlPersonPhone=" + controlPersonPhone +
                ", helpSituation=" + helpSituation +
                ", helpPerson=" + helpPerson +
                ", helpPersonPhone=" + helpPersonPhone +
                ", drugReason=" + drugReason +
                ", drugResult=" + drugResult +
                ", haveCrime=" + haveCrime +
                ", crimeSutiation=" + crimeSutiation +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComDrugPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
            + ", firstDate=" + firstDate + ", controlSituation=" + controlSituation + ", controlPerson=" + controlPerson
            + ", controlPersonPhone=" + controlPersonPhone + ", helpSituation=" + helpSituation + ", helpPerson="
            + helpPerson + ", helpPersonPhone=" + helpPersonPhone + ", drugReason=" + drugReason + ", drugResult="
            + drugResult + ", haveCrime=" + haveCrime + ", crimeSutiation=" + crimeSutiation + ", remark=" + remark
            + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy=" + updateBy
            + "}";
        }
        }