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 |   98 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 96 insertions(+), 2 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 63f5395..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
@@ -1,7 +1,6 @@
 package cn.com.basic.face.discern.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 import cn.com.basic.face.discern.common.BaseEntity;
 
@@ -63,6 +62,19 @@
 		 * 褰撳墠璁块棶鐨勮鍛婄姸鎬�
 		 */
 		public static final String warning = "warning";
+		/**
+		 * 鍚屾鏃堕棿
+		 */
+		public static final String updateTime = "updateTime";
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
+		public static final String visitReason = "visitReason";
 	}
 
 	// 璁块棶浜嬩欢涓婚敭
@@ -89,6 +101,35 @@
 	private String currentStateId;
 	// 褰撳墠璁块棶鐨勮鍛婄姸鎬�
 	private String warning;
+	// 鍚屾鏃堕棿
+	private String updateTime;
+	// 鏄惁鍚屾
+	private String isSynchron;
+	// 璁惧鎵�鍦ㄦ満鏋刬d
+	private String deviceCompanyId;
+
+	private String isValid;
+
+	private String createTime;
+
+	private String visitReason;
+
+	public String getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(String isValid) {
+		this.isValid = isValid;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
 
 	/**
 	 * Get 璁块棶浜嬩欢涓婚敭
@@ -258,12 +299,65 @@
 		this.warning = 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() {
+		return visitReason;
+	}
+
+	public void setVisitReason(String visitReason) {
+		this.visitReason = visitReason;
+	}
+
 	public String toString() {
 		return 
 			 ",璁块棶浜嬩欢涓婚敭 ="+ visitId    +  ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId +  ",璁块棶澶囨敞 =" + remark     + 
 			 ",鏉ヨ鏃堕棿 =" + enterTime  +  ",绛剧鏃堕棿 =" + exitTime   +  ",璁垮绫诲瀷 =" + visitorTypeId + 
 			 ",璁块棶浜哄憳涓婚敭 ="+ visitorId  +  ",visitorCompanyId ="+ visitorCompanyId +  ",琚闂汉鍛樹富閿� ="+ visiteeId  + 
-			 ",visiteeCompanyId ="+ visiteeCompanyId +  ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId +  ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning   
+			 ",visiteeCompanyId ="+ visiteeCompanyId +  ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId +  ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning    + 
+			 ",鍚屾鏃堕棿 =" + updateTime +  ",鏄惁鍚屾 =" + isSynchron +  ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId
 			;
 	}
 }

--
Gitblit v1.8.0