Merge remote-tracking branch 'origin/function_vendor_modify' into function_vendor_modify

# Conflicts:
#	src/main/webapp/resources/view/usercenter/forstore/order_pay.html