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/equipment/vo/EquipmentVO.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index ae9756f..3707015 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -38,16 +38,20 @@
 	private  String beginTime;
 	private  String endTime;
 	private  String pid;
+	private String onlineStatus;
+	/**
+	 * 部门名称集
+	 */
+	private String deptName;
 
-	private String oneContacts;
-	private String twoContacts;
-	private String ThreeContacts;
-	private String onePhone;
-	private String twoPhone;
-	private String ThreePhone;
-	private String oneId;
-	private String twoId;
-	private String threeId;
+	//设备是否处于报警状态
+	String jtype;
+	String contacts;
+	String call;
+	String paddress;
+	String deploymentTime;
+
+
 
 
 }

--
Gitblit v1.9.3