From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/SensorUnitService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/SensorUnitService.java b/src/main/java/com/moral/service/SensorUnitService.java
index 5032cdd..505b937 100644
--- a/src/main/java/com/moral/service/SensorUnitService.java
+++ b/src/main/java/com/moral/service/SensorUnitService.java
@@ -18,6 +18,8 @@
     
     Map<String, Object> getSensorByMac(String mac);
     
-    Map<String, Object> getSensorsByMonitPointId(String id);
+    //Map<String, Object> getSensorsByMonitPointId(String id);
+    
+    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
     
 }

--
Gitblit v1.8.0