修改bug
Merge branch 'dev' of https://github.com/railproject/trainplan into dev

Conflicts:
	src/main/webapp/WEB-INF/views/cross/unit_cross_canvas.jsp