Merge remote-tracking branch 'liujiankang/master'

# Conflicts:
#	watero-rst-web/src/main/resources/watero-rst-orm.xml

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/BackGoodsMapper.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="rml.dao.BackGoodsMapper" >
+<mapper namespace="com.iamberry.rst.service.cm.mapper.BackGoodsMapper" >
   <resultMap id="BaseResultMap" type="rml.model.BackGoods" >
     <id column="back_goods_id" property="backGoodsId" jdbcType="INTEGER" />
     <result column="customer_id" property="customerId" jdbcType="INTEGER" />