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/service/impl/VolunteerCreditsExchangeServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
index bbac553..b8eb376 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -46,11 +46,11 @@
     @Override
     public R getList(int pageNum, int pageSize, String goodsId, String orderNumber,
                      String goodsName, String condition, String userName,String communityId,
-                     String userId,String orderType) {
+                     String userId,String orderType,String merchantId) {
 
         Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize);
         return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,
-                userName,communityId,userId,orderType));
+                userName,communityId,userId,orderType,merchantId));
     }
 
     @Override

--
Gitblit v1.7.1