转台界面已修复，可以正常显示
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev
继续并台，逻辑太复杂了
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev