修复bug
test
delete
Merge remote-tracking branch 'bigImageView/master'
test