From fe3d8816882117d963c93b678573bb93f0047911 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 08 十一月 2022 16:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
index 3262c8d..a19e620 100644
--- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -7,6 +7,7 @@
 import com.dg.core.db.manual.pojo.RecommendResult;
 import com.dg.core.db.manual.pojo.Search;
 import org.springframework.data.repository.query.Param;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -150,5 +151,6 @@
      * @return
      */
     List<TransactionEvent> selectClassifyList(List<String> ids);
+    boolean batchImport(String fileName, MultipartFile file) ;
 
 }

--
Gitblit v1.7.1