From 1daff9a8151820980da082ece4c923f946ff8028 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:00:23 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index 99f77ea..b146e08 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -613,5 +614,19 @@
@GetMapping("/partybuildIng/getPartyMember")
- public R getPartyMember(@RequestParam("userId")Long userId);
+ public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);
+
+ @GetMapping("/partybuildIng/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id);
+
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailByPhone(@RequestParam("phone") String phone);
+
+ /**
+ * 分页查询注册党员列表
+ * @param pageMemberForInviteDTO
+ * @return
+ */
+ @PostMapping("/partybuildIng/page/registerMember")
+ R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO);
}
--
Gitblit v1.7.1