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/Visit.java | 104 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 75 insertions(+), 29 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
index f425e92..cb86130 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
@@ -23,10 +23,6 @@
*/
public static final String visitReasonId = "visitReasonId";
/**
- * 璁块棶浜嬬敱涓婚敭
- */
- public static final String visitReason = "visitReason";
- /**
* 璁块棶澶囨敞
*/
public static final String remark = "remark";
@@ -66,22 +62,23 @@
* 褰撳墠璁块棶鐨勮鍛婄姸鎬�
*/
public static final String warning = "warning";
-
/**
* 鍚屾鏃堕棿
*/
- 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";
+ public static final String visitReason = "visitReason";
}
// 璁块棶浜嬩欢涓婚敭
private String visitId;
- // 璁块棶浜嬬敱涓婚敭
- private String visitReason;
// 璁块棶浜嬬敱涓婚敭
private String visitReasonId;
// 璁块棶澶囨敞
@@ -104,28 +101,33 @@
private String currentStateId;
// 褰撳墠璁块棶鐨勮鍛婄姸鎬�
private String warning;
-
- //鍚屾鏃堕棿
+ // 鍚屾鏃堕棿
private String updateTime;
-
- //鏄惁鍚屾
+ // 鏄惁鍚屾
private String isSynchron;
+ // 璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+ private String isValid;
- public String getUpdateTime() {
- return updateTime;
+ private String createTime;
+
+ private String visitReason;
+
+ 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;
}
@@ -297,13 +299,48 @@
this.warning = warning;
}
- public String toString() {
- return
- ",璁块棶浜嬩欢涓婚敭 ="+ visitId + ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId + ",璁块棶澶囨敞 =" + remark +
- ",鏉ヨ鏃堕棿 =" + enterTime + ",绛剧鏃堕棿 =" + exitTime + ",璁垮绫诲瀷 =" + visitorTypeId +
- ",璁块棶浜哄憳涓婚敭 ="+ visitorId + ",visitorCompanyId ="+ visitorCompanyId + ",琚闂汉鍛樹富閿� ="+ visiteeId +
- ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning
- ;
+ /**
+ * 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 getVisitReason() {
@@ -314,4 +351,13 @@
this.visitReason = visitReason;
}
+ public String toString() {
+ return
+ ",璁块棶浜嬩欢涓婚敭 ="+ visitId + ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId + ",璁块棶澶囨敞 =" + remark +
+ ",鏉ヨ鏃堕棿 =" + enterTime + ",绛剧鏃堕棿 =" + exitTime + ",璁垮绫诲瀷 =" + visitorTypeId +
+ ",璁块棶浜哄憳涓婚敭 ="+ visitorId + ",visitorCompanyId ="+ visitorCompanyId + ",琚闂汉鍛樹富閿� ="+ visiteeId +
+ ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning +
+ ",鍚屾鏃堕棿 =" + updateTime + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId
+ ;
+ }
}
--
Gitblit v1.8.0