刘珊
创建的文件
修改了什么

Signed-off-by: liushan1991 <657627052@qq.com>
合并master代码

Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev-ls' of https://github.com/hnlshzx/PPMoneyClient into dev-ls

Conflicts:
	AndroidManifest.xml
添加了交易投资记录界面

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>
更新支付界面
更新布局
合并主分支

Conflicts:
	.classpath
合并dev-hzx
跟新布局

Signed-off-by: liushan1991 <657627052@qq.com>
添加支付

Conflicts:
	.classpath
添加了交易投资记录listItem布局

Signed-off-by: liushan1991 <657627052@qq.com>
添加了交易投资记录一些参数

Signed-off-by: liushan1991 <657627052@qq.com>
修改了登陆界面不能登陆错误，添加了SwipeRefreshLayout下拉刷新

Signed-off-by: liushan1991 <657627052@qq.com>
添加了些activity

Signed-off-by: liushan1991 <657627052@qq.com>
添加了tradelistview中的适配器和添加了实体TradeInfo

Signed-off-by: liushan1991 <657627052@qq.com>