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/impl/SensorServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..727f319 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -27,7 +27,7 @@
public List<Sensor> queryAll(){
return sensorMapper.selectByExample(null);
}
- public PageBean queryByPageBean(PageBean pageBean){
+ public PageBean<Sensor> queryByPageBean(PageBean pageBean){
return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
}
@Override
@@ -61,4 +61,9 @@
}
}
+
+ @Override
+ public List<Sensor> getAllSensors() {
+ return sensorMapper.selectAll();
+ }
}
--
Gitblit v1.8.0