添加分享
修改编译架构
处理冲突
Merge pull request #7 from majie1993/master

添加分享