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

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

@@ -393,7 +393,7 @@
 			o.sales_post_firm,
 			o.sales_post_num
 		FROM
-			tb_iamberry_shop_sales_order o
+			tb_rst_sales_order_info o
 		WHERE
 			o.sales_post_num is null
 		AND

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

@@ -392,7 +392,7 @@
 		o.sales_post_firm,
 		o.sales_post_num
 		FROM
-		tb_iamberry_shop_sales_order o
+		tb_rst_sales_order_info o
 		WHERE
 		o.sales_post_num is null
 		AND