From 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 17 Aug 2018 17:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 305bee2..c9dc40d 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -1,6 +1,7 @@
package com.moral.entity;
import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
@@ -29,7 +30,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 +38,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 +95,13 @@
* @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;
}
\ No newline at end of file
--
Gitblit v1.8.0