From c4d6c6cc7f6a2342cc32e7f67f6f6eeb76a97ac1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 30 三月 2021 19:53:29 +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 |   14 +++++++++++---
 1 files changed, 11 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..d6bde56 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
@@ -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;
     /**
      * 家庭成员(姓名)
      */
@@ -117,5 +117,13 @@
     @TableField(exist = false)
     private String villageName;
 
+    /**
+     * 性别(1.男 2.女 3.未知)
+     */
+    public interface sex{
+        int nan = 1;
+        int nv = 2;
+        int no = 3;
+    }
 
 }

--
Gitblit v1.7.1