# Conflicts:
#	vendor/composer/installed.json

update app-拼单 自提点列表 经纬度问题

See merge request bp/goods!73

自提点经纬度异常参数兼容

See merge request bp/goods!72

# Conflicts:
#	application/modules/Marketing/controllers/Marketing.php
#	vendor/autoload.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json

Merge branch 'feature_optimize_order_create_refund' of https://git.yidian-inc.com:8021/bp/goods into feature_optimize_order_create_refund

Merge branch 'feature_optimize_order_create_refund' of https://gitlab.yidian-inc.com/bp/goods into feature_optimize_order_create_refund

Pre release

See merge request bp/goods!71