From 0b9ceeec9c387b1499486468779b5c67bec00113 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 23 Apr 2021 16:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index c208f56..cb4660d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -194,7 +194,8 @@
 		//创建对象，并封装数据
 		ConditionVo conditionVo = getConditionVo(map);
 		//查询数据并返回数据
-		return parcelService.exportParcel(conditionVo);
+		List<ParcelExcel> parcelExcels = parcelService.exportParcel(conditionVo);
+		return parcelExcels;
 	}
 
 	/**

--
Gitblit v1.9.3