From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/SensorUnitService.java | 6 +++++-
1 files changed, 5 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..0b6a123 100644
--- a/src/main/java/com/moral/service/SensorUnitService.java
+++ b/src/main/java/com/moral/service/SensorUnitService.java
@@ -18,6 +18,10 @@
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);
+
+ List<Map<String, Object>> getSensorsByMonitPointId2(String id);
}
--
Gitblit v1.8.0