注册
c
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/action/mcht_saler/EqRegistAction.java
	src/main/java/com/yeepay/ytf/merchant/action/mcht_saler/ToAddMcht_salerAction.java
	src/main/java/com/yeepay/ytf/merchant/service/IMsService.java
	src/main/java/com/yeepay/ytf/merchant/service/MsServiceImpl.java
	src/main/java/com/yeepay/ytf/tool/mchtSalerTool/GetMchtSaleTool.java
	src/main/webapp/WEB-INF/xutils-webapp-mcht_saler.xml
	src/main/webapp/dirSeller/business_directSellers.jsp
	src/main/webapp/dirSeller/business_directSellers_register_detail.jsp
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	sql/table/mcht/mcht_term.sql
	src/main/java/com/yeepay/ytf/merchant/action/mcht_saler/AddMcht_salerAction.java
	src/main/java/com/yeepay/ytf/merchant/action/mcht_saler/ToAddMcht_salerAction.java
m
Merge branch 'master' of https://github.com/caining618/ytf_cust.git
..