Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

 src/main/resources/mapper/DeviceMapper.xml

@@ -572,6 +572,6 @@
    </select>
    <select id="getDevice" resultType="com.moral.entity.Device">
        select * from device
        where name like concat('%',#{macOrName},'%')
        where mac like concat('%',#{macOrName},'%')
    </select>
</mapper>