From 818b15dd582d53baa8226cbc2104c26583b4f3bf Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Apr 2018 13:21:27 +0800
Subject: [PATCH] 地图相关资源

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 74b3571..e9bd2a9 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -211,7 +211,9 @@
 	     if(!StringUtils.isBlank(device.getMac())){
              Device simpleDevice = new Device();
              simpleDevice.setId(device.getId());
-             simpleDevice.setDeviceVersion(device.getDeviceVersion());
+			 simpleDevice.setName(device.getName());
+			 simpleDevice.setAddress(device.getAddress());
+             simpleDevice.setDeviceVersionId(device.getDeviceVersionId());
              simpleDevice.setMac(device.getMac());
              simpleDevice.setMonitorPointId(device.getMonitorPointId());
              if(device.getMonitorPointId()!=null){

--
Gitblit v1.8.0