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/ComMngPopulationHouseUserDO.java

@@ -1,12 +1,11 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -73,10 +72,16 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    @Override
    public String toString() {
        return "ComMngPopulationHouseUserDO{" + "id=" + id + ", populId=" + populId + ", houseId=" + houseId
            + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
    }

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
    public interface relation{
    public interface relation {
        int hz = 1;
        int po = 2;
        int zn = 3;
@@ -88,19 +93,8 @@
    /**
     * 人和房屋关系’ (1.自住2、租住)
     */
    public interface relationId{
    public interface relationId {
        int zizhu = 1;
        int zuzhu = 2;
    }

    @Override
    public String toString() {
        return "ComMngPopulationHouseUserDO{" +
                "id=" + id +
                ", populId=" + populId +
                ", houseId=" + houseId +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}