From 7389bfdee40eabf6d8c39252b5485184fc27c168 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:01:29 +0800
Subject: [PATCH] 提交 为发现class

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index d607954..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -13,7 +13,8 @@
  * Instantiates a new device.
  */
 @Data
-public class Device {/**
+public class Device {
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.id
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
@@ -75,6 +76,7 @@
 	 */
 	private Integer deviceVersionId;
 	private String isDelete;
+	private Integer professionId;
 	/**
 	 * Sets the uid.
 	 *
@@ -84,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.
 	 *
@@ -120,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