输入法盖住的问题
Merge remote-tracking branch 'origin/dev' into dev