Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

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

@@ -35,6 +35,8 @@

    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);