图片上传生成缩略图
Merge branch 'master' of github.com:mstjy/test
Merge branch 'wyj'