Merge remote-tracking branch 'origin/master'

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/SmsCouponHistoryDao.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yonbootstrap-dev.propertiesge.cooleshow.portal.dao.SmsCouponHistoryDao">
+<mapper namespace="com.yonge.cooleshow.portal.dao.SmsCouponHistoryDao">
     <resultMap id="couponHistoryDetailMap" type="com.yonge.cooleshow.portal.domain.SmsCouponHistoryDetail"
                extends="com.yonge.cooleshow.mbg.mapper.SmsCouponHistoryMapper.BaseResultMap">
         <association property="coupon" resultMap="com.yonge.cooleshow.mbg.mapper.SmsCouponMapper.BaseResultMap" columnPrefix="c_">