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-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
index 879684d..919a34d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -116,9 +116,9 @@
*/
@GetMapping("/export-parcelKind")
public void exportParcelKind(ConditionVo conditionVo, HttpServletResponse response){
- List<ParcelKindExcel> list = parcelService.exportParcelKind(conditionVo);
- System.out.println("list = " + list);
- ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", list, ParcelKindExcel.class);
+ List<ParcelKindExcel> parcelKindExcelList = parcelService.exportParcelKind(conditionVo);
+ System.out.println("parcelKindExcelList = " + parcelKindExcelList);
+ ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", parcelKindExcelList, ParcelKindExcel.class);
}
--
Gitblit v1.9.3