[fix]by Jinqn 地图的bug //trace3792
Merge remote-tracking branch 'origin/dev-1.3.0' into dev-1.3.0