Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/resources/mapper/DeviceMapper.xml

@@ -561,4 +561,8 @@
    <select id="byMacGetOrgId" resultType="java.lang.String">
            SELECT organization_id FROM `monitor_point` as mt ,device as d where d.monitor_point_id=mt.id and mac=#{mac}
    </select>

    <select id="getDevicesByMpId" resultType="java.util.Map">
        select name,mac from device where monitor_point_id=#{mpId} and is_delete=0
    </select>
</mapper>