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/task/GoodsScheduler.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
index 942f3e8..85603d1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/task/GoodsScheduler.java
@@ -3,10 +3,10 @@
 import com.ruoyi.common.core.enums.ListingStatusEnum;
 import com.ruoyi.common.core.enums.StartStatusEnum;
 import com.ruoyi.goods.domain.GoodsGroupPurchase;
-import com.ruoyi.goods.domain.GoodsSeckill;
 import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
 import com.ruoyi.goods.service.IGoodsSeckillService;
 import com.ruoyi.goods.service.async.AsyncMethodService;
+import com.ruoyi.system.api.domain.GoodsSeckill;
 import java.time.LocalDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

--
Gitblit v1.7.1