From 2020f8a388a82b716f5956014c00b2d76a8a1a65 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 16:03:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java | 107 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 28 deletions(-)
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 be07f29..dce31f5 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,11 +1,12 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
+import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Department
+ * 鍚戜笅
*/
public class Department extends BaseEntity implements Serializable {
@@ -26,16 +27,22 @@
* 閮ㄩ棬棣栧瓧姣�
*/
public static final String deptNameEn = "deptNameEn";
-
+ /**
+ * 鎵�鍦ㄥ叕鍙�
+ */
+ public static final String companyId = "companyId";
/**
* 鍚屾鏃堕棿
*/
- 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";
}
// 閮ㄩ棬涓婚敭
@@ -44,29 +51,14 @@
private String deptName;
// 閮ㄩ棬棣栧瓧姣�
private String deptNameEn;
-
- //鍚屾鏃堕棿
+ // 鎵�鍦ㄥ叕鍙�
+ private String companyId;
+ // 鍚屾鏃堕棿
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 閮ㄩ棬涓婚敭
@@ -110,9 +102,68 @@
this.deptNameEn = deptNameEn;
}
+ /**
+ * Get 鎵�鍦ㄥ叕鍙�
+ */
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ /**
+ * Set 鎵�鍦ㄥ叕鍙�
+ */
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ /**
+ * 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
- ",閮ㄩ棬涓婚敭 =" + deptId + ",閮ㄩ棬鍚嶇О =" + deptName + ",閮ㄩ棬棣栧瓧姣� ="+ deptNameEn
- ;
+ ",閮ㄩ棬涓婚敭 =" + deptId + ",閮ㄩ棬鍚嶇О =" + deptName + ",閮ㄩ棬棣栧瓧姣� ="+ deptNameEn +
+ ",鎵�鍦ㄥ叕鍙� =" + companyId + ",鍚屾鏃堕棿 =" + updateTime + ",鏄惁鍚屾 =" + isSynchron +
+ ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
}
}
--
Gitblit v1.8.0