Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

lizijie

2021-11-29 d8310f6bc609440fa352c0e5a9436c7c78caa287

 src/main/resources/mapper/DeviceMapper.xml

@@ -318,4 +318,13 @@
        SELECT id FROM monitor_point WHERE organization_id=#{orgId}
    );
    </select>

    <select id="getAllDeviceByOrg" resultType="java.util.Map">
        SELECT name,mac
        FROM `device`
        WHERE is_delete=0
          and monitor_point_id in(
            SELECT id FROM monitor_point WHERE organization_id=#{orgId}
        );
    </select>
</mapper>