编写线条抽象类
fix line
Merge branch 'ansel' of https://github.com/lln7777/zhuyun into sx

Conflicts:
	public/javascripts/lines.js
fix bug
Merge branch 'ansel' of https://github.com/lln7777/zhuyun into sx
测试折线