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 | 9 +++++++--
1 files changed, 7 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..c9dc40d 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -30,7 +30,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 +38,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 +96,12 @@
*/
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