显示更新内容
Conflicts: app/controllers/users_controller.rb
Conflicts: db/schema.rb
Conflicts: app/views/users/user_messages.html.erb
表创建以及相关关系的搭建