liujie
2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb
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