Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 src/main/resources/mapper/SensorMapper.xml

@@ -50,8 +50,9 @@
        (
           select dev.id from device_version dev
              <where>
               1 > 1
               <if test="versionNos!=null and versionNos.size() > 0">
               dev.version in
               or dev.version in
                 <foreach collection="versionNos" item="versionNo" open="(" close=")" separator=",">
                      #{versionNo,jdbcType=INTEGER}
                 </foreach>