From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/MonitorPoint.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/entity/MonitorPoint.java b/src/main/java/com/moral/entity/MonitorPoint.java
index 92b0803..6decda3 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -1,5 +1,7 @@
package com.moral.entity;
+import java.util.List;
+
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -30,7 +32,7 @@
*
* @mbggenerated Thu Dec 07 16:40:22 CST 2017
*/
- private double longitude;
+ private Double longitude;
/**
* This field was generated by MyBatis Generator.
@@ -38,7 +40,7 @@
*
* @mbggenerated Thu Dec 07 16:40:22 CST 2017
*/
- private double latitude;
+ private Double latitude;
/**
* This field was generated by MyBatis Generator.
@@ -96,7 +98,15 @@
*/
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