Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/resources/mapper/DeviceMapper.xml

@@ -574,4 +574,7 @@
        select * from device
        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>