modified:   app/views/admin/goods/collocation.html.erb
	modified:   app/views/admin/goods/index.html.erb
	modified:   app/views/manco/history.html.erb
	modified:   app/views/manco/index.html.erb
	modified:   app/views/admin/goods/index.html.erb