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 | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/MonitorPoint.java b/src/main/java/com/moral/entity/MonitorPoint.java
index 3075b6a..c9dc40d 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -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