From b9baa2c78a067e9e67c7c824a28c8fd36682ecc8 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 08 May 2018 13:58:14 +0800
Subject: [PATCH] test

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

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 6d98dfc..3d11d54 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -86,15 +86,6 @@
 	}
 
 	/**
-	 * 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.
 	 *
 	 * @return the device name
@@ -117,11 +108,9 @@
 	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