From b24f9c75c79e4de248505295bfea7055e4975ff4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:23:04 +0800
Subject: [PATCH] Merge branch 'lyq' into 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 5f0d7f2..916ea7a 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
@@ -55,7 +55,7 @@
     /**
      * 门牌号
      */
-    private Integer doorNo;
+    private String doorNo;
     /**
      * 楼排号
      */
@@ -63,11 +63,11 @@
     /**
      * 单元号
      */
-    private Integer unitNo;
+    private String unitNo;
     /**
      * 户室(房间号)
      */
-    private Integer houseNo;
+    private String houseNo;
     /**
      * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)
      */
@@ -150,6 +150,21 @@
     private String healthy;
 
     /**
+     * 房屋地址
+     */
+    private String houseAddress;
+
+    /**
+     * 出生年月日
+     */
+    private String birthday;
+
+    /**
+     * 居住地房屋id
+     */
+    private Long houseId;
+
+    /**
      * 性别(1.男 2.女 3.未知)
      */
     public interface sex{

--
Gitblit v1.7.1