From 1abee89cd55e34fc51102d23f984e3d56ed01647 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 30 四月 2021 15:35:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 440f86e..3d71c1e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -195,7 +195,7 @@
@ApiOperation(value = "家庭成员列表")
@GetMapping("listfamily")
- public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) {
+ public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize) {
Long userId = this.getUserId();
return userService.listFamily(userId, pageNum, pageSize);
}
@@ -353,6 +353,8 @@
PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+ partyBuildingMemberVO.setAuditResult(0);
+ partyBuildingMemberVO.setCommunityId(communityId);
//用户实名认证信息判断
String idCard = loginUserInfo.getIdCard();
--
Gitblit v1.7.1