Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/resources/mapper/SensorMapper.xml

@@ -23,4 +23,16 @@
       where sen.id = dvs.sensor_id and dvs.device_version_id = #{deviceVersionId,jdbcType=INTEGER}
    )
  </select>
  
     <select id="getSensorsByDeviceVersionId" resultType="java.util.Map">
      SELECT
         s.* 
      FROM
         device_version_sensor dvs,
         sensor s 
      WHERE
         dvs.sensor_id = s.id 
         AND dvs.device_version_id = #{deviceVersionId}		
   </select>
  
</mapper>