From 4a99552e883976adc8b726499caaebbe36f19ea7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 06 Jul 2020 10:25:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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