Merge branch 'dev' into dev-ywt
修改了充值记录

Signed-off-by: liushan1991 <657627052@qq.com>
合并
Merge remote-tracking branch 'remotes/origin/dev-ls' into dev
Merge remote-tracking branch 'remotes/origin/dev-ywt' into dev

Conflicts:
	src/com/pmp/ppmoney/activity/MainActivity.java