Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-client-api/src/main/java/com/ym/mec/web/fallback/WebFeignServiceFallback.java

@@ -55,7 +55,7 @@ public class WebFeignServiceFallback implements WebFeignService {
 	}
 
 	@Override
-	public HttpResponseResult<HfMerchantConfig> queryByTenantId(Integer id) {
+	public HttpResponseResult<HfMerchantConfig> queryByTenantId(String payerName,Integer id) {
 		return null;
 	}