Merge branch 'fixbug' into dev
组件到组件改为传递两个对象
Merge branch 'fixbug' into dev
调换代码位置
Merge branch 'fixbug' into dev
fix画线bug