修复光标的方向键问题
Merge remote-tracking branch 'origin/dev' into dev