Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

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



    List<Device> getDevice(String macOrName);





    List<Device> getDeviceByCityCode();





}