kang分支独有~
修正头部显示高度
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Merge branch 'master' into kang

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

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

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

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

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

Conflicts:
	app/controllers/needs_controller.rb
Merge branch 'master' into kang
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Merge branch 'master' into kang
修改头部