tj分支
Merge branch 'master' into tijian

Conflicts:
	db/development.sqlite3
Merge branch 'master' into tijian

Conflicts:
	db/development.sqlite3
Merge branch 'master' into tijian

Conflicts:
	db/development.sqlite3
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Merge branch 'master' into production
Merge branch 'master' into production

Conflicts:
	app/views/layouts/_navbar.html.erb
Merge branch 'master' into production

Conflicts:
	app/views/layouts/_navbar.html.erb
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production

Conflicts:
	app/views/layouts/_navbar.html.erb
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production

Conflicts:
	app/views/layouts/_footer.html.erb
goods 控制器结构
Merge branch 'master' into production
Signed-off-by: eixt <mingyuan0715@foxmail.com>
Signed-off-by: eixt <mingyuan0715@foxmail.com>
Merge branch 'production'