From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java
index 9eb7881..2222291 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerMerchantWithdrawService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -26,10 +27,10 @@
private VolunteerMerchantService vmService;
@Override
- public R getList(int pageNum, int pageSize, String disposeType,String merchantName)
+ public R getList(int pageNum, int pageSize, String disposeType,String merchantName,String merchantId,String communityId)
{
Page<VolunteerMerchantWithdraw> page=new Page(pageNum,pageSize);
- return R.ok(baseMapper.getList(page,disposeType,merchantName));
+ return R.ok(baseMapper.getList(page,disposeType,merchantName,merchantId,communityId));
}
@Override
--
Gitblit v1.7.1