From 364ba784afea825f761197981f6e68f03ee9382e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 16 六月 2021 20:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 916ea7a..98472fe 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
@@ -17,7 +17,7 @@
/**
* 自增 id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.INPUT)
private Long id;
/**
* 街道id
@@ -42,12 +42,17 @@
/**
* 年龄
*/
- private Integer age;
+// private Integer age;
/**
* 身份证号码
*/
@EncryptDecryptField
private String cardNo;
+
+ /**
+ * 临时用
+ */
+ private String cardNoStr;
/**
* 街路巷
*/
@@ -132,7 +137,9 @@
/**
* 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
*/
- private Integer relation;
+// private Integer relation;
+//
+// private String relationStr;
/**
* 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
@@ -144,6 +151,7 @@
*/
private Integer marriage;
+
/**
* 健康状况
*/
@@ -152,7 +160,7 @@
/**
* 房屋地址
*/
- private String houseAddress;
+// private String houseAddress;
/**
* 出生年月日
@@ -162,7 +170,7 @@
/**
* 居住地房屋id
*/
- private Long houseId;
+// private Long houseId;
/**
* 性别（1.男 2.女 3.未知）
--
Gitblit v1.7.1