From dfc3caadc68ac140a515f23be6de02ebac53878e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 17:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/service/IPlaceService.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/service/IPlaceService.java b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
index f603fff..6ec5163 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -17,12 +17,12 @@
 package org.springblade.modules.place.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
 import org.springblade.common.node.TreeStringNode;
 import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.excel.ExportPlaceExcel;
 import org.springblade.modules.place.excel.NinePlaceExcel;
 import org.springblade.modules.place.excel.PlaceAndRelExcel;
-import org.springblade.modules.place.excel.PlaceExcel;
+import org.springblade.modules.place.excel.ImportPlaceExcel;
 import org.springblade.modules.place.vo.PlaceVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -91,7 +91,7 @@
 	 * @param data
 	 * @param isCovered
 	 */
-	void importPlace(List<PlaceExcel> data, Boolean isCovered);
+	String importPlace(List<ImportPlaceExcel> data, Boolean isCovered);
 
 	/**
 	 * 场所(商超)导入
@@ -210,4 +210,11 @@
 	 * @return
 	 */
 	String getCommunityCode(Long id);
+
+	/**
+	 * 导出场所信息
+	 * @param place
+	 * @return
+	 */
+	List<ExportPlaceExcel> exportPlaceList(PlaceVO place);
 }

--
Gitblit v1.9.3