Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

@@ -35,10 +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();


}