From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java b/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
old mode 100644
new mode 100755
index 468e51e..6dd4f1b
--- a/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
+++ b/service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java
@@ -4,6 +4,7 @@
import com.java110.front.controller.CallComponentController;
import com.java110.front.smo.assetExport.IExportMeterWaterSMO;
import com.java110.front.smo.assetExport.IExportRoomSMO;
+import com.java110.front.smo.assetImport.IImportMeterWaterFeeSMO;
import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@
@Autowired
- private IImportRoomFeeSMO importRoomFeeSMOImpl;
+ private IImportMeterWaterFeeSMO importMeterWaterFeeSMOImpl;
@Autowired
private IExportMeterWaterSMO exportMeterWaterSMOImpl;
@@ -35,7 +36,7 @@
*/
public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception {
- return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
+ return importMeterWaterFeeSMOImpl.importExcelData(pd, uploadFile);
}
/**
--
Gitblit v1.8.0