重新生成用户ORM
Merge remote-tracking branch 'origin/master'