From ba203bb099ebe6764eedea44c4f67ee4b1e21918 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:15 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java |   92 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
index 94325cc..f307a02 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
@@ -1,12 +1,11 @@
 package cn.com.basic.face.discern.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 import cn.com.basic.face.discern.common.BaseEntity;
 
 /**
- * PhoneCall
+ * 涓嶅悓姝�
  */
 public class PhoneCall extends BaseEntity implements Serializable {
 
@@ -35,6 +34,18 @@
 		 * 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
 		 */
 		public static final String deviceId = "deviceId";
+		/**
+		 * 鍚屾鏃堕棿
+		 */
+		public static final String updateTime = "updateTime";
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
 	}
 
 	// 绛惧埌浜嬩欢涓婚敭
@@ -47,6 +58,32 @@
 	private String calleeId;
 	// 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
 	private String deviceId;
+	// 鍚屾鏃堕棿
+	private String updateTime;
+	// 鏄惁鍚屾
+	private String isSynchron;
+	// 璁惧鎵�鍦ㄦ満鏋刬d
+	private String deviceCompanyId;
+
+	private String isValid;
+
+	private String createTime;
+
+	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 绛惧埌浜嬩欢涓婚敭
@@ -118,9 +155,54 @@
 		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
-				",绛惧埌浜嬩欢涓婚敭 ="+ phoneCallId +  ",鍛煎彨鏃堕棿 =" + date       +  ",鍛煎彨浜哄憳涓婚敭 ="+ callerId   +
-						",琚懠鍙汉鍛樹富閿� ="+ calleeId   +  ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ deviceId  ;
+		return 
+			 ",绛惧埌浜嬩欢涓婚敭 ="+ phoneCallId +  ",鍛煎彨鏃堕棿 =" + date       +  ",鍛煎彨浜哄憳涓婚敭 ="+ callerId   + 
+			 ",琚懠鍙汉鍛樹富閿� ="+ calleeId   +  ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ deviceId   +  ",鍚屾鏃堕棿 =" + updateTime + 
+			 ",鏄惁鍚屾 =" + isSynchron +  ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
 	}
 }

--
Gitblit v1.8.0