From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 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 a144249..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;
/**
* 出生年月日
@@ -160,29 +168,9 @@
private String birthday;
/**
- * 房屋状态(1.自住 2.租住 3.其他)
- */
- private Integer houseStatus;
-
- /**
- * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）
- */
- private Integer housePurpose;
-
- /**
- * 管控状态(1.常规 2.关注 3.管控)
- */
- private Integer controlStatus;
-
- /**
- * 是否是居住地(1.是 2.否)
- */
- private Integer isResidence;
-
- /**
* 居住地房屋id
*/
- private Long houseId;
+// private Long houseId;
/**
* 性别（1.男 2.女 3.未知）
--
Gitblit v1.7.1