注册功能写完了
Merge remote-tracking branch 'origin/master'