Merge branch 'master'
双缓存显示
Merge branch 'wxc'