Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

 src/main/java/com/moral/service/DeviceService.java

@@ -1,5 +1,7 @@
package com.moral.service;



import com.moral.entity.Device;



import java.util.List;

import java.util.Map;



@@ -20,4 +22,6 @@
    List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs);



    List<Map<String, Object>> getAllByMacList(List<String> macList);



    Device getDeviceByID(int id);

}