修改轮询画点重复问题,增加危险点显示字段
Merge remote-tracking branch 'origin/master'