连拍功能
Merge remote-tracking branch 'origin/master'
连拍，删除多余资源
Merge remote-tracking branch 'origin/master'