Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/resources/mapper/MonitorPointMapper.xml

@@ -225,4 +225,8 @@
        JOIN device d ON d.`monitor_point_id` = m.`id`
        AND d.`mac`= #{mac}
    </select>

    <select id="getMonitorName" resultType="java.lang.String">
        select name from monitor_point where id=#{mpId}
    </select>
</mapper>