用户注册/修改信息/删除用户
Merge remote-tracking branch 'origin/master'