更新User model
Merge branch 'develop'