CreateOrder
IO
delete .idea(keep local)
x
db user
Merge branch 'master' of https://github.com/xy19xiaoyu/GJD into xy19xiaoyu-master

Conflicts:
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
Merge branch 'xy19xiaoyu-master'