测试提交
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/config/webmvc.xml
hgcffvvvvvvvvvv
hj
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git