From a9c8b39ffcb8f8a5f922cb0fce18861b3463d438 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 11:30:45 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

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 6a0cce1..8fcd35e 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
@@ -21,7 +21,7 @@
 		/**
 		 * 鍏徃涓婚敭
 		 */
-		public static final String companyId = "companyId";
+		public static final String deviceCompanyId = "deviceCompanyId";
 		/**
 		 * 璁惧鍦扮偣
 		 */
@@ -35,7 +35,7 @@
 	// 璁惧涓婚敭
 	private String deviceId;
 	// 鍏徃涓婚敭
-	private String companyId;
+	private String deviceCompanyId;
 	// 璁惧鍦扮偣
 	private String deviceName;
 	// 璁惧鎺堟潈鐮�
@@ -58,15 +58,15 @@
 	/**
 	 * Get 鍏徃涓婚敭
 	 */
-	public String getCompanyId() {
-		return companyId;
+	public String getDeviceCompanyId() {
+		return deviceCompanyId;
 	}
 
 	/**
 	 * Set 鍏徃涓婚敭
 	 */
-	public void setCompanyId(String companyId) {
-		this.companyId = companyId;
+	public void setDeviceCompanyId(String deviceCompanyId) {
+		this.deviceCompanyId = deviceCompanyId;
 	}
 
 	/**
@@ -99,7 +99,7 @@
 
 	public String toString() {
 		return 
-			 ",璁惧涓婚敭 =" + deviceId   +  ",鍏徃涓婚敭 =" + companyId  +  ",璁惧鍦扮偣 =" + deviceName + 
+			 ",璁惧涓婚敭 =" + deviceId   +  ",鍏徃涓婚敭 =" + deviceCompanyId  +  ",璁惧鍦扮偣 =" + deviceName +
 			 ",璁惧鎺堟潈鐮� ="+ authorizationId;
 	}
 }

--
Gitblit v1.8.0