From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 7b410e2..a628a6f 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -61,4 +61,9 @@
 
         }
     }
+
+    @Override
+	public List<Sensor> getAllSensors() {
+		return sensorMapper.selectAll();
+	}
 }

--
Gitblit v1.8.0