From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
index 0c0349c..ddf33de 100644
--- a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
+++ b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
@@ -25,13 +25,17 @@
 import org.springblade.modules.animalheat.vo.AnimalHeatVo;
 import org.springblade.modules.pie.ImageData;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
 
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -49,6 +53,8 @@
 
 	private final AnimalHeatService animalHeatService;
 
+
+
 	/**
 	 * 获取体温数据统计
 	 * @param animalHeatVo 条件参数 开始时间，结束时间

--
Gitblit v1.9.3