From 72360aba85cc4ba1b0caf0823f63d0b81a26ce07 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 06 六月 2022 09:47:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 99f77ea..2d3814b 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
@@ -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);
 }

--
Gitblit v1.7.1