From 44164c75df0b09133f1a001d38a41c408666b307 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:48:05 +0800
Subject: [PATCH] 镇村 选项

---
 src/main/java/com/moral/entity/Device.java |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 7c2670f..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,8 +1,10 @@
 package com.moral.entity;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.persistence.Id;
+import javax.persistence.Transient;
 
 import lombok.Data;
 
@@ -11,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
 	 */
@@ -31,12 +34,12 @@
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.longitude
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
-	private Float longitude;
+	private Double longitude;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.latitude
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
-	private Float latitude;
+	private Double latitude;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.mac
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
@@ -72,7 +75,8 @@
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
 	private Integer deviceVersionId;
-	
+	private String isDelete;
+	private Integer professionId;
 	/**
 	 * Sets the uid.
 	 *
@@ -83,15 +87,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
@@ -100,23 +95,24 @@
 		return name;
 	}
 
-	/**
-	 * Sets the monitorpoint.
-	 *
-	 * @param monitorpoint the new monitorpoint
-	 */
-	public void setMonitorpoint(Integer monitorpoint) {
-		this.monitorPointId = monitorpoint;
-	}
+
 
 	/**
 	 * Gets the status.
 	 *
 	 * @return the status
 	 */
-	public String getStatus() {
+	public String getState() {
         return state;
     }
-
-	
+    @Transient
+	private OperateUser operateUser;
+	@Transient
+	private DeviceVersion deviceVersion;
+	@Transient
+	private MonitorPoint monitorPoint;
+	@Transient
+	private List<Integer> organizationIds;
+    @Transient
+    private Profession profession;
 }
\ No newline at end of file

--
Gitblit v1.8.0