From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index e2e4399..e001475 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -24,6 +24,7 @@
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -148,6 +149,7 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
@ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
--
Gitblit v1.9.1