Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/mapper/SensorMapper.java

@@ -32,4 +32,8 @@
    List<Sensor> getSensorsInfoByMac(@Param("mac") String mac);

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

    List<String> getSensorKeys();

    List<Map<String, Object>> getSensorByDId(String id);
}