From 1a10d546c76f474d33e23c5958c08aa0afcdae67 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 11:46:45 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java |   88 ++++++++++++++++++++++++++++---------------
 1 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
index c98f731..acfdb7b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
@@ -1,6 +1,7 @@
 package cn.com.basic.face.discern.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import cn.com.basic.face.discern.common.BaseEntity;
 
@@ -33,22 +34,22 @@
 		/**
 		 * 绛惧埌浣嶇疆
 		 */
-		public static final String deviceId = "deviceId";
-
+		public static final String deviceId = "deviceId";		
 		/**
 		 * 鍚屾鏃堕棿
 		 */
-		public static final String updateTime="update_time";
-
+		public static final String updateTime = "updateTime";
 		/**
 		 * 鏄惁鍚屾
 		 */
-		public static final String  isSynchron="is_synchron";
-
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
 	}
 
 	// 绛惧埌浜嬩欢涓婚敭
-
 	private String attendanceId;
 	// 浜哄憳涓婚敭
 	private String registerId;
@@ -58,32 +59,13 @@
 	private String time;
 	// 绛惧埌浣嶇疆
 	private String deviceId;
-
-	//鍚屾鏃堕棿
+	// 鍚屾鏃堕棿
 	private String updateTime;
-
-	//鏄惁鍚屾
+	// 鏄惁鍚屾
 	private String isSynchron;
-
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getIsSynchron() {
-		return isSynchron;
-	}
-
-	public void setIsSynchron(String isSynchron) {
-		this.isSynchron = isSynchron;
-	}
-
-
-
+	// 璁惧鎵�鍦ㄦ満鏋刬d
+	private String deviceCompanyId;
+	
 	/**
 	 * Get 绛惧埌浜嬩欢涓婚敭
 	 */
@@ -153,6 +135,50 @@
 	public void setDeviceId(String deviceId) {
 		this.deviceId = deviceId;
 	}
+	
+	/**
+	 * Get 鍚屾鏃堕棿
+	 */
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * Set 鍚屾鏃堕棿
+	 */
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	/**
+	 * Get 鏄惁鍚屾
+	 * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+	 */
+	public String getIsSynchron() {
+		return isSynchron;
+	}
+
+	/**
+	 * Set 鏄惁鍚屾
+	 * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+	 */
+	public void setIsSynchron(String isSynchron) {
+		this.isSynchron = isSynchron;
+	}
+
+	/**
+	 * Get 璁惧鎵�鍦ㄦ満鏋刬d
+	 */
+	public String getDeviceCompanyId() {
+		return deviceCompanyId;
+	}
+
+	/**
+	 * Set 璁惧鎵�鍦ㄦ満鏋刬d
+	 */
+	public void setDeviceCompanyId(String deviceCompanyId) {
+		this.deviceCompanyId = deviceCompanyId;
+	}
 
 	public String toString() {
 		return 

--
Gitblit v1.8.0