From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/LotteryEventFallbackFactory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/LotteryEventFallbackFactory.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/LotteryEventFallbackFactory.java
index f0216ad..47e2e1c 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/LotteryEventFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/LotteryEventFallbackFactory.java
@@ -1,7 +1,7 @@
 package com.ruoyi.goods.api.factory;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.goods.api.domain.LotteryEvent;
+import com.ruoyi.goods.api.domain.TLotteryEvent;
 import com.ruoyi.goods.api.service.LotteryEventClient;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
@@ -17,7 +17,7 @@
 		return new LotteryEventClient() {
 			
 			@Override
-			public R<List<LotteryEvent>> getLotteryEventList(Integer activityType) {
+			public R<List<TLotteryEvent>> getLotteryEventList(Integer activityType) {
 				return R.fail("根据开启方式获取活动列表失败:" + cause.getMessage());
 			}
 		};

--
Gitblit v1.7.1