Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

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

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



    List<Device> getDevice(String macOrName);





    List<Device> getDeviceByCityCode();





}