For test
Merge branches 'master' and 'remoteProd' of https://github.com/zhangBenson/zy
增加player页面，更改测试bug
Merge remote-tracking branch 'origin/master'