From 2af7739a8517d2d54c0b4f14af5c77e036cf653e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 14:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
index 719240a..f83d72e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -73,7 +73,7 @@
     /**
      * 小区id(实有房屋id)
      */
-    @ApiModelProperty(value="小区id(实有房屋id)",hidden = true)
+    @ApiModelProperty(value="小区id(实有房屋id)")
     private Integer villageId;
     /**
      * 家庭成员(姓名)
@@ -106,7 +106,7 @@
      * 门牌号
      */
     @ApiModelProperty(value="门牌号")
-    private Integer doorNo;
+    private String doorNo;
     /**
      * 楼排号
      */
@@ -116,12 +116,12 @@
      * 单元号
      */
     @ApiModelProperty(value="单元号")
-    private Integer unitNo;
+    private String unitNo;
     /**
      * 户室(房间号)
      */
     @ApiModelProperty(value="户室(房间号)")
-    private Integer houseNo;
+    private String houseNo;
     /**
      * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)
      */

--
Gitblit v1.7.1