From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git

---
 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 c9dc40d..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;
 
@@ -104,4 +106,7 @@
 
     private Long townCode;
     private Long villageCode;
+    
+    @Transient
+    private List<Device> devices;
 }
\ No newline at end of file

--
Gitblit v1.8.0