修复缩放后的复制位置放置问题
Merge branch 'merge' into dev