fix type
Merge branch 'feature/fixtype' into dev
重构冲撞检测及修复一些 bug
js引入地址错误
Merge branch 'dev' of https://github.com/lln7777/zhuyun into feature/impact

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into feature/impact
删除ots
Merge branch 'feature/delots' into dev
Merge branch 'dev' of https://github.com/lln7777/zhuyun into feature/impact
修复 N 多由合并导致的 bug
Merge branch 'feature/impact' of https://github.com/lln7777/zhuyun into feature/impact
Merge branch 'feature/impact' into dev
修复拓展画布导致的 bug
Merge branch 'feature/drag' of https://github.com/lln7777/zhuyun into optimize
fix bug
修复合并导致的层偶见同时拖动
Merge branch 'dev' of https://github.com/lln7777/zhuyun into sx_func
Merge branch 'feature/drag' of https://github.com/lln7777/zhuyun into sx_func
层配置