Merge branch 'sx_func' into dev
修复两个 bug
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into sx_func
把组件的4个角加上图标并把4个角上的圆合并到一个组中