交易的时候一些问题改正
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/funds_account.php