From 755afa794587a213a273cc62f09032f5262bb069 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 08 十一月 2022 16:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index b2b370d..2a7c7c6 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -303,8 +303,11 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- return null;
-
+ boolean b = iTransactionEventService.batchImport(fileName, file);
+ if (b){
+ return ResultData.success("导入成功");
+ }
+ return ResultData.error("导入失败");
}
--
Gitblit v1.7.1