From 245ab3bcc323dbcc877f8d49fb725b2eec91e118 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:46:33 +0800
Subject: [PATCH] 区域 增加 镇村选项
---
src/main/java/com/moral/entity/Device.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index d180934..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,6 +1,7 @@
package com.moral.entity;
import java.util.Date;
+import java.util.List;
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -12,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
*/
@@ -32,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
@@ -74,6 +76,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
+ private Integer professionId;
/**
* Sets the uid.
*
@@ -83,15 +86,6 @@
this.operateUserId = uid;
}
- /**
- * 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.
*
@@ -108,7 +102,7 @@
*
* @return the status
*/
- public String getStatus() {
+ public String getState() {
return state;
}
@Transient
@@ -117,4 +111,8 @@
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