diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 1046f8d18..0a9d22afc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -434,13 +434,15 @@ public class ShopServiceImpl implements ShopService {
     @Override
     public Integer updateBranchShopDetail(BranchShopDetailRequest request, String userId) {
         //检验门店编码是否重复
-        if(this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){
+        if(StringUtils.isNotEmpty(request.getShopCode())&&this.checkShopCodeRepeat(request.getShopCode(), request.getShopId())){
             throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST);
         }
         ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
         shopInfo.setUpdateUserId(userId);
         shopInfo.setUpdateTime(new Date());
-        shopInfo.setShopCode(request.getShopCode().trim());
+        if (StringUtils.isNotEmpty(request.getShopCode())){
+            shopInfo.setShopCode(request.getShopCode().trim());
+        }
         shopInfo.setShopName(request.getShopName());
         shopInfo.setWantShopAreaId(request.getWantShopAreaId());
         shopInfo.setRegionId(request.getRegionId());