修复人员定位的bug
Merge remote-tracking branch 'origin/master'