修改了转码的问题
Merge remote-tracking branch 'origin/dev-1.4.0' into dev-1.4.0