From 7c4bfcaec18e0f40e03c9e90edf8a15f21cbc639 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 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..06afac5 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
@@ -33,22 +33,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,31 +58,32 @@
private String time;
// 绛惧埌浣嶇疆
private String deviceId;
-
- //鍚屾鏃堕棿
+ // 鍚屾鏃堕棿
private String updateTime;
-
- //鏄惁鍚屾
+ // 鏄惁鍚屾
private String isSynchron;
+ // 璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+ private String isValid;
- public String getUpdateTime() {
- return updateTime;
+ private String createTime;
+
+ public String getIsValid() {
+ return isValid;
}
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
+ public void setIsValid(String isValid) {
+ this.isValid = isValid;
}
- public String getIsSynchron() {
- return isSynchron;
+ public String getCreateTime() {
+ return createTime;
}
- public void setIsSynchron(String isSynchron) {
- this.isSynchron = isSynchron;
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
}
-
-
/**
* Get 绛惧埌浜嬩欢涓婚敭
@@ -153,6 +154,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