From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index c6873e5..38042d5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -22,6 +22,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.entity.HealthcodeExcel;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -29,11 +30,8 @@
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.jfpt.alarm.vo.AlarmExcel;
-import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.healthcode.entity.Healthcode;
 import org.springblade.jfpt.healthcode.service.IhealthcodeService;
-import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
 import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
 import org.springblade.jfpt.healthcode.wrapper.healthcodeWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -253,4 +251,6 @@
 		List<HealthcodeExcel> list = ihealthcodeService.exportHealthcode(healthcodeVO);
 		ExcelUtil.export(response, "健康码数据" + DateUtil.time(), "健康码数据表", list, HealthcodeExcel.class);
 	}
+
+
 }

--
Gitblit v1.9.3