更新活动信息
Merge branch 'develop'