From ac762de6529d1a34e23db1a5c6f41ad41a93277a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 八月 2023 13:30:34 +0800
Subject: [PATCH] 新增商家端商家类型
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..e10683e 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,8 +262,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)
{
return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
}
--
Gitblit v1.7.1