From 4c0f9a7eb32a1a449fa472a01d9284642f19cc25 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 17:13:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
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