升级kinetic后连线颜色问题
Merge branch 'merge' into dev
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge
Merge branch 'merge' into dev
修改错误代码，提升性能
fix 连线bug