#做好完整流程，采用session存储全局数据
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git
#update log