From d3238fb1beffa8e28e805d0f78e37e4d8530e702 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 13:16:06 +0800
Subject: [PATCH] 实体更新

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 588df3f..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,5 +113,6 @@
 	private MonitorPoint monitorPoint;
 	@Transient
 	private List<Integer> organizationIds;
-
+    @Transient
+    private Profession profession;
 }
\ No newline at end of file

--
Gitblit v1.8.0