From ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 14 十二月 2021 13:58:17 +0800
Subject: [PATCH] Merge branch 'west_bigscreen_dev' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
index b5463fb..3fc7a5a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
@@ -13,7 +13,7 @@
 @ApiModel
 public class FourMemberDetailVO {
     @ApiModelProperty("基础数据及房屋数据")
-    private ComMngPopulationVO comMngPopulationVO;
+    private ComMngPopulationNoSecretVO comMngPopulationVO;
     @ApiModelProperty("党员数据")
     private ComPbMemberVO partyBuildingMemberVO;
 }

--
Gitblit v1.7.1