From 3ed85078fdd0a84f21c4ee24c3ce92b94bf16340 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 07 May 2018 23:05:06 +0800
Subject: [PATCH] test

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index d607954..6d98dfc 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
 	 */
@@ -116,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