From e0481de620e36cadf136348534b60617109b5032 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 八月 2023 14:37:05 +0800
Subject: [PATCH] 新增积分商城模块(新增商品   编辑商品  删除商品   商品列表)   修改活动人员统计为0   修改小程序活动报名报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
index eeac215..8563982 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -38,9 +38,9 @@
      */
     @GetMapping("/queryList")
     public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
-                       @RequestParam("pageSize")  int pageSize,
-                       @RequestParam("name")  String name,
-                       @RequestParam("state")  String state)
+                                                @RequestParam("pageSize")  int pageSize,
+                                                @RequestParam(value = "name", required = false) String name,
+                                                @RequestParam(value = "state", required = false) String state)
     {
         Page page=new Page<VolunteerIntegralMerchant>(pageNum,pageSize);
         return R.ok(merchantService.queryList(page,name,state));
@@ -136,7 +136,7 @@
     }
 
     @DeleteMapping("/deleteById")
-    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
+    public R  VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id)
     {
         int num= merchantService.deleteById(id);
         if(num>0)

--
Gitblit v1.7.1