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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 757f78e..6d98dfc 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 double 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 double 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
@@ -115,6 +117,11 @@
private OperateUser operateUser;
@Transient
private DeviceVersion deviceVersion;
+ //@Transient
+ //private MonitorPoint monitorPoint;
@Transient
- private MonitorPoint monitorPoint;
+ private List<Integer> organizationIds;
+
+ @Transient
+ private MonitorPoint monitorpointDetail;
}
\ No newline at end of file
--
Gitblit v1.8.0