fix bug
Merge branch 'master' of https://github.com/buaaring/ring-web.git
Merge branch 'master' of https://github.com/buaaring/ring-web