Conflicts: app/controllers/bids_controller.rb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb config/locales/zh.yml config/routes.rb lib/redmine.rb
Conflicts: app/helpers/bids_helper.rb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb config/locales/zh.yml db/schema.rb
修复了一些需求中的BUG