From 06eb23476c809d54a705119d6cf7207bca03d2c8 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 07 May 2018 22:02:35 +0800
Subject: [PATCH] test

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 6490bc1..6d98dfc 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -117,8 +117,11 @@
 	private OperateUser operateUser;
 	@Transient
 	private DeviceVersion deviceVersion;
-	@Transient
-	private MonitorPoint monitorPoint;
+	//@Transient
+	//private MonitorPoint monitorPoint;
 	@Transient
 	private List<Integer> organizationIds;
+
+	@Transient
+	private MonitorPoint monitorpointDetail;
 }
\ No newline at end of file

--
Gitblit v1.8.0