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 | 3 +--
1 files changed, 1 insertions(+), 2 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 48fe5ac..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
@@ -27,13 +27,12 @@
private IAssetExportSMO assetExportSMOImpl;
/**
- * 娣诲姞搴旂敤鏁版嵁
+ * 璧勪骇瀵煎叆鏂规硶 灏咵xcel涓殑鏁版嵁鐩存帴瀵煎叆鍒拌〃閲�
*
* @param pd 椤甸潰鏁版嵁灏佽
* @return ResponseEntity 瀵硅薄
*/
public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception{
-
return assetImportSMOImpl.importExcelData(pd,uploadFile);
}
--
Gitblit v1.8.0