Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/payment/AdapayController.java

@@ -212,7 +212,7 @@ public class AdapayController extends BaseController {
         int pageIndex = 1;
         List<Map<String, Object>> data = new ArrayList<>();
         while (profiles.equals("prod") || profiles.equals("pre")) {
-        	HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.ADAPAY.getCode());
+        	HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId());
             if(hfMerchantConfig == null){
             	throw new BizException("机构[{}]汇付商户信息找不到", TenantContextHolder.getTenantId());
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -690,7 +690,7 @@ public class ExportServiceImpl implements ExportService {
         List<Map<String, Object>> data = new ArrayList<>();
         while ("prod".equals(profiles) || "pre".equals(profiles)) {
             Map<String, Object> paymentList = null;
-            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.ADAPAY.getCode());
+            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId());
             if (hfMerchantConfig == null) {
                 throw new BizException("机构[{}]汇付商户信息找不到", TenantContextHolder.getTenantId());
             }