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/resources/mapper/SensorUnitMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/SensorUnitMapper.xml b/src/main/resources/mapper/SensorUnitMapper.xml
index 2d661f4..a24a98f 100644
--- a/src/main/resources/mapper/SensorUnitMapper.xml
+++ b/src/main/resources/mapper/SensorUnitMapper.xml
@@ -26,7 +26,7 @@
   </select>
   
   <select id="getSensorsByMonitPointId" resultType="java.util.Map">
-  	SELECT mp.id,s.sensor_key,su.id,su.sensor_id,su.name,su.rules
+  	SELECT mp.id,s.sensor_key,s.unit,su.id,su.sensor_id,su.name,su.rules
 	FROM monitor_point mp,organization org,organization_sensor_unit osu,sensor_unit su, sensor s
 	WHERE mp.organization_id = org.id
 	AND org.id = osu.organization_id

--
Gitblit v1.8.0