From a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 13 五月 2021 13:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
index 905dc45..5f0d7f2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -1,9 +1,6 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
@@ -89,6 +86,14 @@
@EncryptDecryptField
private String phone;
/**
+ * 外地or本地（1.本地 2.外地）
+ */
+ private Integer outOrLocal;
+ /**
+ * 户口所在地
+ */
+ private String censusRegister;
+ /**
* 备注
*/
private String remark;
@@ -99,10 +104,12 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
* 修改时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updateAt;
/**
* 籍贯
@@ -121,6 +128,26 @@
*/
@TableField(exist = false)
private String villageName;
+
+ /**
+ * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
+ */
+ private Integer relation;
+
+ /**
+ * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
+ */
+ private Integer cultureLevel;
+
+ /**
+ * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)
+ */
+ private Integer marriage;
+
+ /**
+ * 健康状况
+ */
+ private String healthy;
/**
* 性别（1.男 2.女 3.未知）
@@ -150,4 +177,12 @@
int no = 13;
}
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ public interface outOrLocal{
+ int bd = 1;
+ int wd = 2;
+ }
+
}
--
Gitblit v1.7.1