修改活动信息
Merge remote-tracking branch 'origin/master'