From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java
index 2edffd1..3840d05 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java
@@ -3,15 +3,10 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
-import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
 import com.panzhihua.service_community.dao.VolunteerIntegralMerchantDao;
-import com.panzhihua.service_community.dao.VolunteerIntegralRecordDao;
 import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
-import com.panzhihua.service_community.entity.VolunteerIntegralRecord;
 import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
-import com.panzhihua.service_community.service.VolunteerIntegralRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -28,8 +23,8 @@
     }
 
     @Override
-    public IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state) {
-        return baseMapper.queryList(page,name,state);
+    public IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state,String goodType,String merchantId) {
+        return baseMapper.queryList(page,name,state,goodType,merchantId);
     }
 
     @Override
@@ -46,4 +41,9 @@
     public int deleteById(String id) {
         return baseMapper.deleteById(id);
     }
+
+    @Override
+    public int getNum(String id) {
+        return baseMapper.getNum(id);
+    }
 }

--
Gitblit v1.7.1