From 79e0d3094c1fcf9025938479b6e46d2e9dfebdb6 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 08 十二月 2022 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 2 +-
1 files changed, 1 insertions(+), 1 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 a19e620..9aa31e6 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
@@ -151,6 +151,6 @@
* @return
*/
List<TransactionEvent> selectClassifyList(List<String> ids);
- boolean batchImport(String fileName, MultipartFile file) ;
+ Integer batchImport(String fileName, MultipartFile file) ;
}
--
Gitblit v1.7.1