From e74987c5c7e6256e84a0852f36a367bf8f2e032d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 16:21:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 617bbfd..905dc45 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+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 +13,7 @@
@Data
@TableName(value = "com_mng_population")
+@EncryptDecryptClass
public class ComMngPopulationDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -22,15 +25,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 +49,7 @@
/**
* 身份证号码
*/
+ @EncryptDecryptField
private String cardNo;
/**
* 街路巷
@@ -82,6 +86,7 @@
/**
* 联系方式
*/
+ @EncryptDecryptField
private String phone;
/**
* 备注
@@ -117,5 +122,32 @@
@TableField(exist = false)
private String villageName;
+ /**
+ * 性别（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;
+ }
}
--
Gitblit v1.7.1