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

Conflicts:
	src/main/java/com/yeepay/ytf/merchant/model/Mcht_saler.java
	src/main/webapp/WEB-INF/xutils-webapp_mcht_saler.xml