新增积分商城模块（新增商品 编辑商品 删除商品 商品列表） 修改活动人员统计为0 修改小程序活动报名报错

lidongdong

2023-08-25 4485aa853e3c300972ad16fca14d5f18e8a2d013

新增积分商城模块（新增商品   编辑商品  删除商品   商品列表）   修改活动人员统计为0   修改小程序活动报名报错

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -11495,8 +11495,8 @@
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state);
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "state", required = false) String state);

    /**
     * 新增

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java

@@ -35,11 +35,11 @@
     */
    @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)
    {
        return R.ok(merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state));
        return merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
    }

    /**