From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/MonitorPoint.java | 2 ++
1 files changed, 2 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..5909997 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -96,6 +96,8 @@
*/
private String description;
@Transient
+ private Integer state;
+ @Transient
private AreaNames areaNames;
@Transient
private Organization organization;
--
Gitblit v1.8.0