Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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

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

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

    List<String> getSensorKeys();
}