Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

 src/main/resources/mapper/DeviceMapper.xml

@@ -194,7 +194,7 @@
   </resultMap>
   <!-- resultMap引用 -->
   <select id="selectOrganizationIds" resultType="INTEGER">
      call proc_organization_id_select(#{id,jdbcType=INTEGER});
      call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
   </select>
   <select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
      select