From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 25 五月 2024 09:39:30 +0800
Subject: [PATCH] 解决冲突

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
index 68bfb79..bf42aed 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -17,12 +17,11 @@
 import com.ruoyi.goods.service.IGoodsSeckillService;
 import com.ruoyi.goods.service.IGoodsSkuService;
 import com.ruoyi.goods.service.async.AsyncMethodService;
-import com.ruoyi.system.api.constants.DelayTaskEnum;
-import com.ruoyi.system.api.domain.DelayTask;
 import com.ruoyi.system.api.domain.GoodsSeckill;
 import com.ruoyi.system.api.domain.GoodsSku;
 import com.ruoyi.system.api.domain.dto.ListStatusDTO;
 import com.ruoyi.system.api.feignClient.OrderClient;
+import com.ruoyi.system.api.feignClient.SysUserClient;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -47,7 +46,6 @@
     private final OrderClient orderClient;
     private final RedisService redisService;
     private final SysUserClient sysUserClient;
-    private final RedissonClient redissonClient;
     private final AsyncMethodService asyncMethodService;
     @Override
     @Transactional(rollbackFor = Exception.class)

--
Gitblit v1.7.1