From 4f40d5eea0b9ecefa80632c53d2c6e7f5cc6c35a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 13:25:47 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java |  101 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 93 insertions(+), 8 deletions(-)

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 19cc0f0..43c17f0 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,11 +1,13 @@
 package cn.com.basic.face.discern.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import cn.com.basic.face.discern.common.BaseEntity;
 
 /**
  * 鏁版嵁瀛楀吀
+ * 锛屽弻鍚�
  */
 public class Dictionary extends BaseEntity implements Serializable {
 
@@ -17,7 +19,7 @@
 		/**
 		 * 涓婚敭
 		 */
-		public static final String id = "id";
+		public static final String dictId = "dictId";
 		/**
 		 * 缂栫爜
 		 */
@@ -42,10 +44,26 @@
 		 * 澶囨敞
 		 */
 		public static final String remark = "remark";
+		/**
+		 * 鍏徃涓婚敭
+		 */
+		public static final String compnayId = "compnayId";
+		/**
+		 * 鍚屾鏃堕棿
+		 */
+		public static final String updateTime = "updateTime";
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
 	}
 
 	// 涓婚敭
-	private String id;
+	private String dictId;
 	// 缂栫爜
 	private String sn;
 	// 鍚嶇О
@@ -58,19 +76,27 @@
 	private String pid;
 	// 澶囨敞
 	private String remark;
+	// 鍏徃涓婚敭
+	private String compnayId;
+	// 鍚屾鏃堕棿
+	private String updateTime;
+	// 鏄惁鍚屾
+	private String isSynchron;
+	// 璁惧鎵�鍦ㄦ満鏋刬d
+	private String deviceCompanyId;
 
 	/**
 	 * Get 涓婚敭
 	 */
-	public String getId() {
-		return id;
+	public String getDictId() {
+		return dictId;
 	}
 
 	/**
 	 * Set 涓婚敭
 	 */
-	public void setId(String id) {
-		this.id = id;
+	public void setDictId(String dictId) {
+		this.dictId = dictId;
 	}
 
 	/**
@@ -157,10 +183,69 @@
 		this.remark = remark;
 	}
 
+	/**
+	 * Get 鍏徃涓婚敭
+	 */
+	public String getCompnayId() {
+		return compnayId;
+	}
+
+	/**
+	 * Set 鍏徃涓婚敭
+	 */
+	public void setCompnayId(String compnayId) {
+		this.compnayId = compnayId;
+	}
+
+	/**
+	 * 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 
-			 ",涓婚敭 ="   + id         +  ",缂栫爜 ="   + sn         +  ",鍚嶇О ="   + name       + 
+			 ",涓婚敭 ="   + dictId     +  ",缂栫爜 ="   + sn         +  ",鍚嶇О ="   + name       + 
 			 ",绫诲瀷 ="   + type       +  ",鎺掑簭 ="   + orderBy    +  ",鐖剁骇id =" + pid        + 
-			 ",澶囨敞 ="   + remark    ;
+			 ",澶囨敞 ="   + remark     +  ",鍏徃涓婚敭 =" + compnayId  +  ",鍚屾鏃堕棿 =" + updateTime + 
+			 ",鏄惁鍚屾 =" + isSynchron +  ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
 	}
 }

--
Gitblit v1.8.0