addcostModel.jsp修改
名称修改
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/webapp/costModel/modifyCostModel.jsp
名字修改
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/webapp/costModel/addcostModel.jsp
	src/main/webapp/costModel/costModel.jsp
	src/main/webapp/costModel/modifyCostModel.jsp