修复pre中html被转义的问题
Merge remote-tracking branch 'origin/dev-1.3.6' into dev-1.3.6