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_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
index 5f60e22..f8b2be3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
@@ -11,7 +11,7 @@
 
 
 @Slf4j
-@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
+@Api(tags = {"新增双争双评"})
 @RestController
 @RequestMapping("/NewFightOrder")
 public class NewFightShoppingOrderApi
@@ -28,16 +28,18 @@
     @GetMapping("/orderGetList")
     public R orderGetList(@RequestParam("pageNum") int pageNum,
                           @RequestParam("pageSize") int pageSize,
-                          @RequestParam(value = "userId", required = false)String userId,
-                          @RequestParam(value = "goodsId", required = false)String goodsId,
-                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
-                          @RequestParam(value = "goodName", required = false)String goodName,
-                          @RequestParam(value = "name", required = false)String name,
-                          @RequestParam(value = "cancelType", required = false)String cancelType,
-                          @RequestParam(value = "communityId", required = false)String communityId)
+                          @RequestParam(value = "userId", required = false) String userId,
+                          @RequestParam(value = "goodsId", required = false) String goodsId,
+                          @RequestParam(value = "orderNumber", required = false) String orderNumber,
+                          @RequestParam(value = "goodName", required = false) String goodName,
+                          @RequestParam(value = "name", required = false) String name,
+                          @RequestParam(value = "cancelType", required = false) String cancelType,
+                          @RequestParam(value = "communityId", required = false) String communityId,
+                          @RequestParam(value = "merchantId", required = false) String merchantId,
+                          @RequestParam(value = "orderType", required = false) String orderType)
     {
         return orderService.getList(pageNum,pageSize,userId,goodsId,orderNumber,
-                goodName,name,cancelType,communityId);
+                goodName,name,cancelType,communityId,merchantId,orderType);
     }
 
     /**

--
Gitblit v1.7.1