new order fix
api
fix
add user_name to users
fix
fix
fix
fix
fix
fix
api doc
Merge branch 'bf-1.8.1' into dev-order
fix conflict
after this pull,please run rake db:migrate;rails runner script/fix/add_user_name_to_user.rb;