From 7f905053f3f879092e18558401185dd6595dbe10 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 15:11:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index d525564..5d7bf3d 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -1,10 +1,21 @@
 package com.moral.service;
 
+import java.util.List;
+
 import com.moral.common.bean.PageBean;
 import com.moral.entity.Sensor;
 
+import java.util.List;
+
 public interface SensorService {
+    List<Sensor> queryAll();
+
     public PageBean queryByPageBean(PageBean pageBean);
+
+    PageBean queryByVersionId(Integer deviceVersionId);
+
     public void addOrModify(Sensor sensor);
     public void deleteByIds(Integer... ids);
+
+    public List<Sensor> getAllSensors();
 }

--
Gitblit v1.8.0