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/animalheat/service/AnimalHeatService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java
index cca3f9e..d34643a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java
@@ -2,12 +2,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.jfpt.alarm.vo.AlarmExcel;
-import org.springblade.jfpt.alarm.vo.AlarmVO;
+import org.springblade.common.entity.ReportReturnData;
 import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
-import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
+import org.springblade.common.entity.AnimalHeatExcel;
 import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
-import org.springblade.jfpt.animalheat.vo.StatisVo;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 
 import java.util.List;
@@ -78,4 +76,9 @@
 	List<AnimalHeatExcel> exportAnimalHeat(AnimalHeatVo animalHeatVo);
 
 
+	/**
+	 * 导出体温数据列表
+	 * @param animalHeatVo 条件
+	 */
+    List<ReportReturnData> getAnimalHeatPie(AnimalHeatVo animalHeatVo);
 }

--
Gitblit v1.9.3