From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java b/service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java
index d1898b2..a54f69f 100755
--- a/service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java
@@ -33,7 +33,6 @@
* @return ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception{
-
return assetImportSMOImpl.importExcelData(pd,uploadFile);
}
--
Gitblit v1.8.0