From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/entity/Device.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index ec0b15f..d607954 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,6 +1,7 @@
 package com.moral.entity;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.persistence.Id;
 import javax.persistence.Transient;
@@ -117,4 +118,6 @@
 	private DeviceVersion deviceVersion;
 	@Transient
 	private MonitorPoint monitorPoint;
+	@Transient
+	private List<Integer> organizationIds;
 }
\ No newline at end of file

--
Gitblit v1.8.0