０５１５００１
Merge branch 'sprint7' of https://github.com/myama2630/r2system into sp7work
051502
Merge branch 'sprint7' of https://github.com/myama2630/r2system into sp7work
0521最新取得前Merge branch 'sprint7' of https://github.com/myama2630/r2system into sp7work

Conflicts:
	app/views/engineorders/allocated.html.erb
0521TK-01182適用
Merge pull request #62 from myama2630/sp7work

Sp7work  TK-01182 適用　宛先を設置先名に変更する