Merge pull request #9 from ylnb91/master

activity模块更新
Merge pull request #3 from tidezyc/master

bb