fix 定位bug
Merge branch 'fixbug' into dev