From cea9aba8d0e4833bac428d071664cbe84e6180c9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 15 Jun 2018 09:47:49 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/entity/Device.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 6490bc1..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -76,6 +76,7 @@
 	 */
 	private Integer deviceVersionId;
 	private String isDelete;
+	private Integer professionId;
 	/**
 	 * Sets the uid.
 	 *
@@ -85,15 +86,6 @@
 		this.operateUserId = uid;
 	}
 
-	/**
-	 * Sets the device name.
-	 *
-	 * @param device_name the new device name
-	 */
-	public void setDevice_name(String  device_name) {
-		this.name = device_name;
-	}
-	
 	/**
 	 * Gets the device name.
 	 *
@@ -121,4 +113,6 @@
 	private MonitorPoint monitorPoint;
 	@Transient
 	private List<Integer> organizationIds;
+    @Transient
+    private Profession profession;
 }
\ No newline at end of file

--
Gitblit v1.8.0