From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/MonitorPoint.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/entity/MonitorPoint.java b/src/main/java/com/moral/entity/MonitorPoint.java
index 305bee2..6decda3 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -1,6 +1,9 @@
package com.moral.entity;
+import java.util.List;
+
import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
@@ -29,7 +32,7 @@
*
* @mbggenerated Thu Dec 07 16:40:22 CST 2017
*/
- private Float longitude;
+ private Double longitude;
/**
* This field was generated by MyBatis Generator.
@@ -37,7 +40,7 @@
*
* @mbggenerated Thu Dec 07 16:40:22 CST 2017
*/
- private Float latitude;
+ private Double latitude;
/**
* This field was generated by MyBatis Generator.
@@ -94,4 +97,16 @@
* @mbggenerated Thu Dec 07 16:40:22 CST 2017
*/
private String description;
+ @Transient
+ private Integer state;
+ @Transient
+ private AreaNames areaNames;
+ @Transient
+ private Organization organization;
+
+ private Long townCode;
+ private Long villageCode;
+
+ @Transient
+ private List<Device> devices;
}
\ No newline at end of file
--
Gitblit v1.8.0