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/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