添加现金与转账判断
Merge remote-tracking branch 'origin/master'