修改用户模型添加字段判断
Merge remote-tracking branch 'origin/master'
再来提交下
Merge remote-tracking branch 'origin/master'