Merge remote-tracking branch 'origin/huacheng' into huacheng

101captain

2022-06-06 72360aba85cc4ba1b0caf0823f63d0b81a26ce07

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -613,5 +613,5 @@


    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId);
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type);
}