xx
Merge branch 'master' of
https://lujunqi@github.com/caining618/ytf_cust.git

Conflicts:
	src/main/webapp/salesman/addSManInfo.jsp
Merge branch 'master' of https://lujunqi@github.com/caining618/ytf_cust.git