上传jpg
Merge branch 'master' of github.com:uhp/uhp
Merge branch 'uhp1.1'
fix