Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

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

@@ -35,6 +35,15 @@

    List<Map<String, String>> getSensorsMaps(String mac);

    List<Map<String, String>> getSensorsAllMap();

    List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters);

    List<List<String>> listSensorInfos(String[] sensorsResult);

    List<List<Map<String, Object>>> listExcelDatas(List<List<String>> sensorInfos, List<Map<String, Object>> list);

    List<String> getSensorKeys();


}