From 158522c03cf587abac4260b984c18da2ee251448 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 31 Mar 2021 01:00:57 +0800
Subject: [PATCH] 1

---
 .../main/java/com/bweb/controller/HighMerchantController.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
index a389163c..5fcc7421 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
@@ -120,7 +120,6 @@ public class HighMerchantController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, "");
             }
             if (highMerchant.getId() == null
-                    || StringUtils.isBlank(highMerchant.getMerchantKey())
                     || StringUtils.isBlank(highMerchant.getMerchantName())
                     || StringUtils.isBlank(highMerchant.getTelephone())
                     || StringUtils.isBlank(highMerchant.getAddress())