qq jsp
Merge branch 'master' of https://github.com/caining618/ytf_cust.git
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/webapp/WEB-INF/xutils-webapp-mcht.xml
qq
Merge branch 'master' of https://github.com/caining618/ytf_cust.git
qq 入网加上传图片
Merge branch 'master' of https://github.com/caining618/ytf_cust.git