Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

4 years ago · 0c2d55d5f8
parent 17e6f9cfcf d05f1ada46
commit 0c2d55d5f8
1 changed files with 0 additions and 1 deletions
--- a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java
@ -121,7 +121,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())