From 970ed0f8df6a19e4e3dae062c4e2e2232a0b97d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 11:06:45 +0800
Subject: [PATCH] 删除商家bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 58 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 617bbfd..cba57e2 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,6 +83,7 @@
     /**
      * 联系方式
      */
+    @EncryptDecryptField
     private String phone;
     /**
      * 备注
@@ -94,10 +96,12 @@
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createAt;
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
     /**
      * 籍贯
@@ -117,5 +121,52 @@
     @TableField(exist = false)
     private String villageName;
 
+    /**
+     * 与户主关系
+     */
+    private String relation;
+
+    /**
+     * 文化程度
+     */
+    private String cultureLevel;
+
+    /**
+     * 婚姻状况
+     */
+    private String 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;
+    }
 
 }

--
Gitblit v1.7.1