时间类型工具类
jjj
添加行程库实体类
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/WebRoot/WEB-INF/views/layout.jsp