测试3
dbconfig.properties
dongqing layout.jsp
dongqing Xingcheng_xianlu.jsp
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/WebRoot/WEB-INF/views/XingCheng/Xingcheng_Mingxi.jsp
	PhoenixTravelAgencyPro/config/dbconfig.properties
u