合并测试代码
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/.classpath
	PhoenixTravelAgencyPro/.settings/org.eclipse.wst.common.component
	PhoenixTravelAgencyPro/pom.xml
	PhoenixTravelAgencyPro/src/com/fenghuang/dao/impl/ApprovalDaoImpl.java
u
合并文件
合并代码
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/config/dbconfig.properties
	PhoenixTravelAgencyPro/src/com/fenghuang/dao/impl/SanpinzhongxinDaoImpl.java
处理代码 合并的操作
测试合并代码

Signed-off-by: easyhao1314 <easyhao1314@126.com>
Merge branch 'master' of https://github.com/easyhao1314/TravelPlatform.git
Merge branch 'master' of https://github.com/easyhao1314/TravelPlatform.git
提交登陆合并代码