提交冲突
test
test
财务提交
daimachuxianwenti   tijiao
Merge branch 'master' of
https://github.com/easyhao1314/TravelPlatform.git

Conflicts:
	PhoenixTravelAgencyPro/WebRoot/WEB-INF/views/CaoZuo/Caozuo_Liebiao.jsp
	PhoenixTravelAgencyPro/WebRoot/WEB-INF/views/SanPin/SanPin_CaoZuo.jsp
	PhoenixTravelAgencyPro/src/com/fenghuang/dao/impl/OperateDaoImpl.java
Merge branch 'master' of https://github.com/easyhao1314/TravelPlatform.git
修改Caozuo_Liebiao.jsp   王东清