From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
index 095a45d..dd52a19 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
@@ -1,17 +1,10 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.PromotionVideo;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
-import com.ruoyi.system.api.model.CompanySysUserReq;
-import com.ruoyi.system.api.model.CompanyUserListVo;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.web.bind.annotation.PathVariable;
-
import java.util.List;
+import org.springframework.cloud.openfeign.FallbackFactory;
/**
* @author mitao
@@ -23,11 +16,11 @@
public PromotionClient create(Throwable cause) {
return new PromotionClient(){
@Override
- public R<List<PromotionVideo>> getPromotionVideoList() {
+ public R<List<PromotionVideo>> getPromotionVideoList(String source) {
return R.fail("通过视频集合查询用户失败:" + cause.getMessage());
}
@Override
- public R<PromotionVideo> getPromotionVideoOne(Integer promotionVideoId) {
+ public R<PromotionVideo> getPromotionVideoOne(Long promotionVideoId, String source) {
return R.fail("获取视频信息失败:" + cause.getMessage());
}
--
Gitblit v1.7.1