Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/DeviceMapper.xml

@@ -572,6 +572,9 @@
    </select>
    <select id="getDevice" resultType="com.moral.entity.Device">
        select * from device
        where name like concat('%',#{macOrName},'%')
        where mac like concat('%',#{macOrName},'%')
    </select>
    <select id="getDeviceByCityCode" resultType="com.moral.entity.Device">
        SELECT d.* FROM `monitor_point` mt,device d where d.monitor_point_id=mt.id and d.state!=4 and mt.city_code=130900
    </select>
</mapper>