From d343b71cd89f59a87e85c46ce7a04d47c357462d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:46:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 29 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 4c89ba0..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 {
@@ -46,16 +48,18 @@
* 鍏徃涓婚敭
*/
public static final String compnayId = "compnayId";
-
/**
* 鍚屾鏃堕棿
*/
- 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";
}
// 涓婚敭
@@ -74,32 +78,12 @@
private String remark;
// 鍏徃涓婚敭
private String compnayId;
-
-
- //鍚屾鏃堕棿
+ // 鍚屾鏃堕棿
private String updateTime;
-
- //鏄惁鍚屾
+ // 鏄惁鍚屾
private String isSynchron;
-
-
- public String getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getIsSynchron() {
- return isSynchron;
- }
-
- public void setIsSynchron(String isSynchron) {
- this.isSynchron = isSynchron;
- }
-
-
+ // 璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
/**
* Get 涓婚敭
@@ -213,10 +197,55 @@
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
",涓婚敭 =" + dictId + ",缂栫爜 =" + sn + ",鍚嶇О =" + name +
",绫诲瀷 =" + type + ",鎺掑簭 =" + orderBy + ",鐖剁骇id =" + pid +
- ",澶囨敞 =" + remark + ",鍏徃涓婚敭 =" + compnayId ;
+ ",澶囨敞 =" + remark + ",鍏徃涓婚敭 =" + compnayId + ",鍚屾鏃堕棿 =" + updateTime +
+ ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
}
}
--
Gitblit v1.8.0