fix the bug of confusing weixin_user and xinshu_user
Merge branch 'dev' of github.com:whitefoxx/wx into dev