From d36fc654851786c47448d57612d604d174d9e051 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 28 二月 2023 14:19:37 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

---
 src/main/java/com/whyc/controller/BOMFeedbakController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BOMFeedbakController.java b/src/main/java/com/whyc/controller/BOMFeedbakController.java
index 90d3684..a166aaf 100644
--- a/src/main/java/com/whyc/controller/BOMFeedbakController.java
+++ b/src/main/java/com/whyc/controller/BOMFeedbakController.java
@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 @RestController
 @Api(tags = "鍙嶉绠$悊")
@@ -42,9 +43,9 @@
 
     @ApiOperation("鎻愪氦鍙嶉")
     @PostMapping("submitFeedback")
-    public Response submitFeedback(@RequestPart(required = false) MultipartFile multipartFile,@RequestParam String feedbackJson) throws IOException, MessagingException {
+    public Response submitFeedback(@RequestPart(required = false) List<MultipartFile> multipartFileList, @RequestParam String feedbackJson) throws IOException, MessagingException {
         BOMFeedback feedback = ActionUtil.getGson().fromJson(feedbackJson, BOMFeedback.class);
-        return service.submitFeedback(feedback,multipartFile);
+        return service.submitFeedback(feedback,multipartFileList);
     }
 
     @ApiOperation(value = "鏍规嵁鏂囦欢璺緞涓嬭浇")

--
Gitblit v1.9.1