From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/SensorMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index 45f8e4c..c0cd5e8 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -4,7 +4,13 @@
import com.moral.entity.Sensor;
import java.util.List;
+import java.util.Map;
public interface SensorMapper extends BaseMapper<Sensor> {
List<Sensor> selectByVersionId(Integer deviceVersionId);
+
+ List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
+
+ List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
+
}
\ No newline at end of file
--
Gitblit v1.8.0