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 | 86 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 79 insertions(+), 7 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 018a608..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,8 @@
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;
import java.io.Serializable;
@@ -11,6 +10,7 @@
@Data
@TableName(value = "com_mng_population")
+@EncryptDecryptClass
public class ComMngPopulationDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -22,15 +22,15 @@
/**
* 街道id
*/
- private Integer streetId;
+ private Long streetId;
/**
* 社区id
*/
- private Integer actId;
+ private Long actId;
/**
* 小区id（实有房屋id）
*/
- private Integer villageId;
+ private Long villageId;
/**
* 家庭成员（姓名）
*/
@@ -46,6 +46,7 @@
/**
* 身份证号码
*/
+ @EncryptDecryptField
private String cardNo;
/**
* 街路巷
@@ -82,7 +83,16 @@
/**
* 联系方式
*/
+ @EncryptDecryptField
private String phone;
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ private Integer outOrLocal;
+ /**
+ * 户口所在地
+ */
+ private String censusRegister;
/**
* 备注
*/
@@ -94,10 +104,12 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
* 修改时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updateAt;
/**
* 籍贯
@@ -108,9 +120,69 @@
*/
private String nation;
/**
+ * 是否租住(0.否 1.是)
+ */
+ private Integer isRent;
+ /**
* 小区名字
*/
+ @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.未知）
+ */
+ public interface sex{
+ int nan = 1;
+ int nv = 2;
+ int no = 3;
+ }
+
+ /**
+ * 是否租住
+ */
+ public interface isOk{
+ int yes = 1;
+ int no = 0;
+ }
+
+ /**
+ * 政治面貌
+ */
+ public interface politicalOutlook{
+ int dang = 1;
+ int tuan = 3;
+ int wu = 12;
+ int qun = 13;
+ int no = 13;
+ }
+
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ public interface outOrLocal{
+ int bd = 1;
+ int wd = 2;
+ }
}
--
Gitblit v1.7.1