From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/SensorUnitService.java b/src/main/java/com/moral/service/SensorUnitService.java
index 505b937..0b6a123 100644
--- a/src/main/java/com/moral/service/SensorUnitService.java
+++ b/src/main/java/com/moral/service/SensorUnitService.java
@@ -22,4 +22,6 @@
     
     Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
     
+    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
+    
 }

--
Gitblit v1.8.0