From 8a7fbad84879f277e10f857004c31d57aeecbd5a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 14 五月 2021 11:22:53 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 0630e48..719240a 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
@@ -69,7 +69,7 @@
      * 社区id
      */
     @ApiModelProperty(value="社区id",hidden = true)
-    private Integer actId;
+    private Long actId;
     /**
      * 小区id（实有房屋id）
      */
@@ -90,6 +90,7 @@
      */
     @ApiModelProperty(value="年龄")
     private Integer age;
+
     /**
      * 身份证号码
      */

--
Gitblit v1.7.1