From cbe3888bb6b1012273f16409f988114abd4542c5 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 14:10:00 +0800
Subject: [PATCH] 新增小程序商家购买下单接口 小程序积分兑换记录列表修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 dda56c2..1d681de 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
@@ -167,7 +167,7 @@
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize)
{
- return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize);
+ return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize,"1");
}
/**************************************************************************************************
@@ -262,10 +262,10 @@
@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)
{
- return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",null);
}
--
Gitblit v1.7.1