Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

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

@@ -89,4 +89,11 @@
    List<Map<String, Object>> getDevicesByMpId(int mpId);



    String byMacGetOrgId(String mac);



    List<Device> getDevice(String macOrName);





    List<Device> getDeviceByCityCode();



    List<Device> getDevicesByAccountId(String id);

}