恢复了大量丢失的改动
修复了Bug
修复了下单会奔溃的Bug
修复个人信息页面的Bug
Merge branch 'master' into Zhang
Merge pull request #5 from BIT-TaoXue/Zhang

Zhang