修正冲撞检测方法
Merge branch 'fixbug/chongzhuang' into fixbug/duplicate
Merge branch 'fixbug/duplicate' into dev