Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

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

@@ -7,6 +7,12 @@


    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);



    List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters);



    List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters);



    List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters);



    List<String> getMacs();



    List<String> getMacByOrganizationid(List<Object> organizationIdList);