Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

 src/main/resources/mapper/MonitorPointMapper.xml

@@ -115,4 +115,7 @@
            ]]>
      </where>
   </select>
   <select id="selectOrganizationIds" parameterType="integer" resultType="integer">
                call proc_organizationIds_GetByMonitorPointId(#{id,jdbcType=NUMERIC})
   </select>
</mapper>