From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改，根据坐标判断是否在多边形区域内 2.考勤打卡接口修改，根据打卡时间判断打卡的状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java |   11 +++++++++--
 1 files changed, 9 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..f0bc69a 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,22 @@
 	/**
 	 *开始时间
 	 */
-	private Date begTime;
+	private String begTime;
 
 	/**
 	 * 结束时间
 	 */
-	private Date endTime;
+	private String endTime;
 
 	/**
 	 * 状态  0： 当天时间统计数据     1： 本周内的数据统计
 	 */
 	private Integer type;
+
+	/**
+	 * 时间分布状态
+	 */
+	private String timeDesc;
+
+
 }

--
Gitblit v1.9.3