From b0a4d23b83b9cdbdee15263acdd4e7353a8286a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 07 八月 2024 18:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/admin/src/main/java/com/doumee/api/business/ShopController.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/server/admin/src/main/java/com/doumee/api/business/ShopController.java b/server/admin/src/main/java/com/doumee/api/business/ShopController.java
index 1afee8f..082befb 100644
--- a/server/admin/src/main/java/com/doumee/api/business/ShopController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/ShopController.java
@@ -109,10 +109,6 @@
     })
     @RequiresPermissions("business:shop:create")
     public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file ) {
-//        Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_SHOP);
-//        if(importing!=null && importing){
-//            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
-//        }
         shopService.importBatch(file);
 //        shopService.dealShopNamePath();
         return ApiResponse.success("鎿嶄綔鎴愬姛");

--
Gitblit v1.9.3