素材拍照功能添加
Merge branch 'yaoyong' into developer