Merge pull request #1 from hldzlk/master

gen
Merge pull request #2 from hldzlk/master

gg
Merge pull request #3 from hldzlk/master

首页覆盖bug+注册页
map
bug update
Merge pull request #5 from mumuka/master

bug update