From fe609c99cd295ac64aa76e31eee4ae21bb167302 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 30 九月 2021 09:11:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index e3fb348..94918a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -12,10 +12,7 @@
import com.panzhihua.common.enums.PopulRelationEnum;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
@@ -205,7 +202,7 @@
// comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
// }
- ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
+ ComMngPopulationNoSecretVO comMngPopulationVO = new ComMngPopulationNoSecretVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
// 查询户主关系信息
--
Gitblit v1.7.1