Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -91,4 +91,9 @@
    String byMacGetOrgId(String mac);



    List<Device> getDevice(String macOrName);





    List<Device> getDeviceByCityCode();





}