fixed
Merge branch 'dev' of github.com:RedrockTeam/weixin_activity into dev