From 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 09:13:12 +0800
Subject: [PATCH] 解决冲突

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index f97c276..0286509 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -7,7 +7,7 @@
 import com.ruoyi.auction.controller.management.vo.AuctionBidRecordVO;
 import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
 import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.AuctionGoods;
 import com.ruoyi.auction.mapper.AuctionGoodsMapper;
 import com.ruoyi.auction.service.IAuctionBidRecordService;
 import com.ruoyi.auction.service.IAuctionGoodsService;

--
Gitblit v1.7.1