From 0c3d9face27e194906bffe046a81b01e18faaef4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 16:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 22b0d3f..eda6e5a 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
@@ -66,7 +66,7 @@
* @return 编辑结果
*/
@PostMapping("/partybuildIng/resetpartyorganization")
- R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO);
+ R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
/**
* 删除党支部
@@ -74,7 +74,7 @@
* @return 删除结果
*/
@PostMapping("/partybuildIng/deletepartyorganization")
- R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);
+ R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
/**
* 批量新增党员
@@ -364,7 +364,19 @@
@PostMapping("/partybuildIng/addactivityinfo")
R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);
-
+ /**
+ * 查询用户党员认证信息
+ * @param id 用户ID
+ * @return 查询结果
+ */
+ @GetMapping("/partybuildIng/usercertification")
+ R userCertification(@RequestParam("id") Long id);
-
+ /**
+ * 查询待认证党员信息
+ * @param pagePartyBuildingMemberVO 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/pageusercertification")
+ R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
}
--
Gitblit v1.7.1