From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/ExcelController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
index a669f47..177a003 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
@@ -150,4 +150,20 @@
}
+ /**
+ * ���������������
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @PostMapping("rexcelImport")
+ public ResultMessage rexcelImport(HttpServletRequest request) throws IOException {
+
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+
+ excelService.rexcelImport(files);
+ return ResultMessage.ok(1);
+ }
+
+
}
--
Gitblit v1.8.0