pull用に
commiti
Merge branch 'sprint10' of https://github.com/myama2630/r2system into sprint10work

Conflicts:
	app/controllers/engineorders_controller.rb
Merge branch 'sprint10' of https://github.com/myama2630/r2system into sprint10work
TK-01275 TK01276の適用
Merge pull request #116 from myama2630/sprint10work

10/2日作業分　TK-01275・TK-01276 の反映