Conflicts: app/controllers/student_work_controller.rb db/schema.rb
Conflicts: db/schema.rb public/stylesheets/project.css
Conflicts: app/views/layouts/new_base_user.html.erb
Conflicts: db/schema.rb
2.代码查重按钮位置 3.查重结果样式