From 4ca768a6e07bf7e776625bc148a0fc61d00b05b1 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 16:30:56 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java  |   21 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java |   23 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java    |   20 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java   |   21 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java |   21 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java     |   21 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java |   20 ++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java   |   16 +++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java |   24 +++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java       |   22 +++++
 10 files changed, 198 insertions(+), 11 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 acfdb7b..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
@@ -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;
 
@@ -65,7 +64,27 @@
 	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 绛惧埌浜嬩欢涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
index 4be342e..bf51035 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
@@ -46,6 +46,26 @@
 	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 鍏徃涓婚敭
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
index dce31f5..bb4250b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.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;
 
@@ -59,6 +58,25 @@
 	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 閮ㄩ棬涓婚敭
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 4b97b52..4f5bb95 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.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;
 
@@ -174,6 +173,26 @@
 	// 璁惧鎵�鍦ㄦ満鏋刬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 璁惧涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
index 43c17f0..8d64c19 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.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;
 
@@ -78,13 +77,34 @@
 	private String remark;
 	// 鍏徃涓婚敭
 	private String compnayId;
-	// 鍚屾鏃堕棿
+
+	//鍚屾鏃堕棿
 	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 涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java
index c40d18f..04436a1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.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;
 
@@ -42,6 +41,26 @@
 	// 鏄惁鍚屾
 	private String isSynchron;
 
+	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 浜哄憳涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java
index 51f0166..62b1a14 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.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;
 
@@ -78,6 +77,26 @@
 	// 璁惧鎵�鍦ㄦ満鏋刬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 涓婚敭
 	 */
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 b3c005a..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,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;
 
@@ -66,6 +65,26 @@
 	// 璁惧鎵�鍦ㄦ満鏋刬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 绛惧埌浜嬩欢涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
index 3384bf2..40b1993 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.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;
 
@@ -48,6 +47,27 @@
 	// 璁惧鎵�鍦ㄦ満鏋刬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 鑱屼綅涓婚敭
 	 */
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
index 9972a80..eaa160c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.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;
 
@@ -220,6 +219,21 @@
 	private String company;
 	private String visitorOrAttender;
 
+
+	private String isValid;
+
+
+	public String getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(String isValid) {
+		this.isValid = isValid;
+	}
+
+
+
+
 	/**
 	 * Get 浜哄憳涓婚敭
 	 */

--
Gitblit v1.8.0