From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index eefb269..0462992 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -59,11 +59,6 @@
 	}
 	
 	@Override
-	public List<Map<String, Object>> getSensorsByDevice(String mac) {
-		return deviceMapper.getSensorsByDevice(mac);
-	}
-
-	@Override
 	@Transactional
 	public void saveOrUpdateDevice(Device device) {
 		ValidateUtil.notNull(device, "param.is.null");

--
Gitblit v1.8.0