From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/SensorMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index 6c8e581..638ffe6 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -32,4 +32,8 @@
     List<Sensor> getSensorsInfoByMac(@Param("mac") String mac);
 
     List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters);
+
+    List<String> getSensorKeys();
+
+    List<Map<String, Object>> getSensorByDId(String id);
 }
\ No newline at end of file

--
Gitblit v1.8.0