From dfe41d5fa39a2fc3c25689c2c6152ae8fa476bce Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 15:36:30 +0800
Subject: [PATCH] 新增商家详情接口   修改查询用户信息报错

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 3cdb075..1b6af0b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11495,7 +11495,9 @@
     public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                        @RequestParam("pageSize")  int pageSize,
                        @RequestParam(value = "name", required = false) String name,
-                       @RequestParam(value = "state", required = false) String state);
+                       @RequestParam(value = "state", required = false) String state,
+                        @RequestParam(value = "goodType", required = false) String goodType,
+                        @RequestParam(value = "merchantId", required = false) String merchantId);
 
     /**
      * 新增
@@ -11617,8 +11619,12 @@
     public R deleteVolunteerMerchant(@RequestParam("pageNum") String id);
 
     @GetMapping("/VolunteerMerchant/getUser")
-    public R volunteerMerchantGetUser(@RequestParam("pageNum") String communityId,
-                                      @RequestParam("pageNum") String userName,
-                                      @RequestParam("pageNum") String userPhone);
+    public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
+                                      @RequestParam(value = "userName", required = false) String userName,
+                                      @RequestParam(value = "userPhone", required = false)String userPhone);
+
+
+    @GetMapping("/getById")
+    public R volunteerMerchantGetById(@RequestParam("id") String id);
 
 }

--
Gitblit v1.7.1