Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml

@@ -381,7 +381,7 @@
  	</select>
 
 	<!--查詢訂單表-->
-	<select id="selectProbationShopOrderList" resultMap="selectProbationShopOrderListResult">
+	<select id="selectWateroPFOrderList" resultMap="selectProbationShopOrderListResult">
 		SELECT
 		o.sales_orderid,
 		o.sales_post_firm,
@@ -395,7 +395,7 @@
 	</select>
 
 	<!-- 更新拉取成功的订单 -->
-	<update id="updateProbationShopOrder" parameterType="com.iamberry.wechat.core.entity.order.Order">
+	<update id="updateWateroPFOrder" parameterType="com.iamberry.wechat.core.entity.order.Order">
 		update  tb_iamberry_shop_sales_order
 		set
 		sales_post_num= #{salesPostNum},