Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -34,4 +34,6 @@
    List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters);

    List<String> getSensorKeys();

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