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/SensorService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index b178088..5d7bf3d 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -1,5 +1,7 @@
package com.moral.service;
+import java.util.List;
+
import com.moral.common.bean.PageBean;
import com.moral.entity.Sensor;
@@ -14,4 +16,6 @@
public void addOrModify(Sensor sensor);
public void deleteByIds(Integer... ids);
+
+ public List<Sensor> getAllSensors();
}
--
Gitblit v1.8.0