升级kinetic后连线颜色问题
Merge branch 'merge' into dev