Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6

 src/main/resources/mapper/DeviceMapper.xml

@@ -12,7 +12,7 @@
      WHERE
         d.monitor_point_id = mp.id 
         AND mp.organization_id IN
         <foreach close=")" collection="orgIds" item="listItem" open="(" separator=",">
         <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
            #{listItem}
         </foreach>
      </if>