Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 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);
}