Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

puhanshu

2021-09-13 68a3e4c053d15961ede69fe7698f63fe827624c3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthElderliesDO.java

@@ -1,6 +1,8 @@
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;
@@ -17,6 +19,7 @@

@Data
@TableName("com_elder_auth_elderlies")
@EncryptDecryptClass
public class ComElderAuthElderliesDO implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -55,6 +58,7 @@
    /**
    * 身份证号
    */
    @EncryptDecryptField
    private String idCard;

    /**
@@ -116,6 +120,7 @@
    /**
    * 更新时间
    */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
@@ -123,29 +128,14 @@
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComElderAuthElderliesDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", phone=" + phone +
                ", name=" + name +
                ", idCard=" + idCard +
                ", sex=" + sex +
                ", age=" + age +
                ", birthday=" + birthday +
                ", personnelCategory=" + personnelCategory +
                ", isRegister=" + isRegister +
                ", isAlive=" + isAlive +
                ", address=" + address +
                ", remark=" + remark +
                ", receiveAllowanceBegin=" + receiveAllowanceBegin +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
    /**
     * 人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）
     */
    public interface personnelCategory {
        int under90 = 1;
        int under100 = 2;
        int above100 = 3;
        }


}