From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 cba57e2..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
@@ -86,6 +86,14 @@
@EncryptDecryptField
private String phone;
/**
+ * 外地or本地（1.本地 2.外地）
+ */
+ private Integer outOrLocal;
+ /**
+ * 户口所在地
+ */
+ private String censusRegister;
+ /**
* 备注
*/
private String remark;
@@ -122,19 +130,19 @@
private String villageName;
/**
- * 与户主关系
+ * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
*/
- private String relation;
+ private Integer relation;
/**
- * 文化程度
+ * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
*/
- private String cultureLevel;
+ private Integer cultureLevel;
/**
- * 婚姻状况
+ * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)
*/
- private String marriage;
+ private Integer marriage;
/**
* 健康状况
@@ -169,4 +177,12 @@
int no = 13;
}
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ public interface outOrLocal{
+ int bd = 1;
+ int wd = 2;
+ }
+
}
--
Gitblit v1.7.1