修改route规则
Merge branch 'dev-change-route' into cors

Conflicts:
	app/controllers/api/trips_controller.rb