From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index 8e77fa9..1b8bf78 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -86,7 +86,6 @@
public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
//将map转换为json对象
String s = JSON.toJSONString(map);
- System.out.println("s = " + s);
if (null!=beanName){
return reportClient.getHealthcodeList(s);
}
@@ -152,7 +151,8 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- return reportClient.getParcelList(body);
+ List<ParcelExcel> parcelList = reportClient.getParcelList(body);
+ return parcelList;
}
return null;
}
--
Gitblit v1.9.3