产生冲突了
Merge branch 'master' of https://github.com/xsq871839012/BitWallet