xiugai
Merge branch 'master' of https://github.com/golfdev/Gftest.git
修改bug