Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/TbCfCouponDao.xml

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java

@@ -9,8 +9,6 @@ import com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfToicouponEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity;
 import com.diaoyun.zion.chinafrica.service.TbCfCouponService;
-import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
-import com.diaoyun.zion.chinafrica.service.TbCfToiCouponService;
 import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
 import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
 import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;