查询
Merge branch 'master' of https://github.com/caining618/ytf_cust.git
查询
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/java/com/yeepay/ytf/rateModel/dao/query/RateModelQryDao.java
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/java/com/yeepay/ytf/merchant/action/mcht_saler/AddMcht_salerAction.java
	src/main/java/com/yeepay/ytf/merchant/model/Mcht_saler.java
	src/main/java/com/yeepay/ytf/merchant/service/IMsService.java
	src/main/java/com/yeepay/ytf/merchant/service/MsServiceImpl.java