From a0db807a93ec00317c590207399e96d7a2c42ba9 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Thu, 8 Mar 2018 22:50:01 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java b/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
index 1bdf240..39c116a 100644
--- a/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Service
 public class FileUploadDemo {
-    public static List<JSONObject> fileUpload(CommonsMultipartFile[] multipartFiles) {
+    public List<JSONObject> fileUpload(CommonsMultipartFile[] multipartFiles) {
         List<JSONObject> list = new ArrayList<>();
         JSONObject materialInfo;
         for (MultipartFile multipartFile : multipartFiles) {