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

@@ -411,7 +411,7 @@
 		sales_post_num= #{salesPostNum},
 		sales_post_firm= #{salesPostFirm},
 		sales_send_date= #{salesSendDate},
-		sales_send_date= '5'
+		sales_status= '5'
 		where
 		sales_orderid = #{salesOrderid}
 	</update>