媒体主问题修改
Merge branch 'master' of github.com:cyndiWade/chengwai