Merge pull request #1 from satzcoal/master

hello
xy
Merge branch 'master' of https://github.com/satzcoal/GJD

Conflicts:
	db/development.sqlite3
++列表样式
++新建销售订单
--差创建出库单
--执行出库2步骤
Merge branch 'xiaoyu'

Conflicts:
	config/routes.rb
	db/schema.rb