From eb55f31266b1b4a2bb3014592c991e719312ffc3 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 15:40:09 +0800
Subject: [PATCH] 新增小程序商家商品列表   商品详情接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
index 298fcb4..1b9f686 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -271,6 +271,22 @@
 
 
     /**
+     * 分页查询
+     * @param
+     * @return
+     */
+    @GetMapping("/VolunteerIntegralMerchant/merchantQueryList")
+    public R MerchantQueryList(@RequestParam("pageNum") int pageNum,
+                                @RequestParam("pageSize")  int pageSize,
+                                @RequestParam(value = "name", required = false) String name,
+                                @RequestParam(value = "state", required = false) String state,
+                                @RequestParam(value = "merchantId", required = false) String merchantId)
+    {
+        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"2",merchantId);
+    }
+
+
+    /**
      * 新增
      * @param
      * @return

--
Gitblit v1.7.1