删除数据库中的冗余
首页画面刷新Ok
更新占位图片
Merge branch 'master1'

Conflicts:

PGC.xcodeproj/project.xcworkspace/xcuserdata/xiaoshuai.xcuserdatad/UserI
nterfaceState.xcuserstate