Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

@@ -16,7 +16,7 @@

    List<Sensor> selectByOrgId(Integer organizationId);

   List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
   List<Map<String, Object>> getSensorsByDeviceVersionId(Map<String, Object> parameters);
   
    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);