From 6cde6bc12ebb814de85cd0e389ffc7e3869818fb Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 07 九月 2022 17:44:02 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/SoftwareController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SoftwareController.java b/src/main/java/com/whyc/controller/SoftwareController.java
index b9ea170..0474783 100644
--- a/src/main/java/com/whyc/controller/SoftwareController.java
+++ b/src/main/java/com/whyc/controller/SoftwareController.java
@@ -43,7 +43,7 @@
@ApiOperation("杞欢涓婁紶")
@PostMapping("upload")
- public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr){
+ public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
return service.upload(file1,file2,softwareList);
}
--
Gitblit v1.9.1