修改了
Merge branch 'dev' into dev-ls
修改了赠送
增加了我的投资

Signed-off-by: liushan1991 <657627052@qq.com>
完善了赠送，投资记录，交易记录

Signed-off-by: liushan1991 <657627052@qq.com>
添加赠送历史记录

Signed-off-by: liushan1991 <657627052@qq.com>
修改了我的赠送

Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev' into dev-ls

Conflicts:
	src/com/pmp/ppmoney/PPMoneyApplication.java
	src/com/pmp/ppmoney/activity/InvestListInprograssActivity.java
	src/com/pmp/ppmoney/activity/TradeListActivity.java
修改了合并分支
合并分支

Signed-off-by: liushan1991 <657627052@qq.com>
更新布局
Merge remote-tracking branch 'remotes/origin/dev-ls' into dev
合并dev-ls分支
Merge branch 'dev' into dev-hzx