Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
ced956b9 2 parents 4eaceccb 1ad8df0e

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
1 package com.fedex.connect.customer.repository.base; 1 package com.fedex.connect.customer.repository.base;
2 2
3 -import com.fedex.connect.customer.repository.mapper.ConsignmentExtMapper; 3 +import com.fedex.connect.customer.repository.dao.ConsignmentExtMapper;
4 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
5 5
6 public class BaseDao { 6 public class BaseDao {
......
1 -package com.fedex.connect.customer.repository.mapper; 1 +package com.fedex.connect.customer.repository.dao;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.query.ConsignmentQuery; 4 import com.fedex.connect.customer.data.query.ConsignmentQuery;
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.fedex.connect.customer.repository.mapper.ConsignmentExtMapper"> 3 +<mapper namespace="com.fedex.connect.customer.repository.dao.ConsignmentExtMapper">
4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Consignment"> 4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Consignment">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
......