Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -782,8 +782,8 @@
    }

    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(userId,type);
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(phone,type);
    }
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){