# 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

修改序列化方式

See merge request bp/goods!70

团餐活动列表已结束列表增加缓存

See merge request bp/goods!69

Pre release

See merge request bp/goods!68

Pre release

See merge request bp/goods!67

活动详情增加生活号管理员信息

See merge request bp/goods!66

Hotfix topic

See merge request bp/goods!64

fixed:topic

See merge request bp/goods!63

Pre release

See merge request bp/goods!62

Feature ota manage

See merge request bp/goods!61

Pre release

See merge request bp/goods!60

拼单接入app

See merge request bp/goods!59