From 7c6612561f7f82f88c9c0a0f0b8343b317f468e0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 09:43:54 +0800
Subject: [PATCH] 新增小程序商家体现列表 商家兑换记录
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 aa0195a..abf5287 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
@@ -197,10 +197,11 @@
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "userId", required = false) String userId,
- @RequestParam(value = "orderType", required = false) String orderType)
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
{
return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,userId,orderType);
+ condition,userName,communityId,userId,orderType,merchantId);
}
/**
--
Gitblit v1.7.1