From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java
index 5d9dd86..e857b2f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java
@@ -14,15 +14,17 @@
 	/**
 	 *开始时间
 	 */
-	private Date begTime;
+	private String begTime;
 
 	/**
 	 * 结束时间
 	 */
-	private Date endTime;
+	private String endTime;
 
 	/**
 	 * 状态  0： 当天时间统计数据     1： 本周内的数据统计
 	 */
 	private Integer type;
+
+
 }

--
Gitblit v1.9.3