From d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:36:24 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 1f8af3d..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;
@@ -623,9 +624,9 @@
 
     /**
      * 分页查询注册党员列表
-     * @param partyBuildingMemberVO
+     * @param pageMemberForInviteDTO
      * @return
      */
     @PostMapping("/partybuildIng/page/registerMember")
-    R pageRegisterMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+    R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO);
 }

--
Gitblit v1.7.1