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/ComCultPopulationDO.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
@@ -103,22 +103,10 @@

@Override
public String toString() {
        return "ComCultPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", cultName=" + cultName +
                ", basicSituation=" + basicSituation +
                ", joinCultDate=" + joinCultDate +
                ", isExternalPublicity=" + isExternalPublicity +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        return "ComCultPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", cultName=" + cultName
            + ", basicSituation=" + basicSituation + ", joinCultDate=" + joinCultDate + ", isExternalPublicity="
            + isExternalPublicity + ", remark=" + remark + ", createAt=" + createAt + ", createBy=" + createBy
            + ", updateAt=" + updateAt + ", updateBy=" + updateBy + "}";
        }
        }