From a31816bd82fcf2c10df0cef7f078645676149e78 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 13:56:32 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据 完善

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 0f170b7..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -76,7 +76,7 @@
 	 */
 	private Integer deviceVersionId;
 	private String isDelete;
-	private String professionId;
+	private Integer professionId;
 	/**
 	 * Sets the uid.
 	 *
@@ -113,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