fix 缩放问题
Merge branch 'fixbug/scale' into dev