From ef3b216bd85ada0b7af1dd25a468e1aa258267fa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 五月 2024 18:10:00 +0800
Subject: [PATCH] 处理冲突
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java | 11 ++++++-----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java | 11 ++---------
2 files changed, 8 insertions(+), 14 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..f767b8a 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
@@ -27,7 +20,7 @@
return R.fail("通过视频集合查询用户失败:" + cause.getMessage());
}
@Override
- public R<PromotionVideo> getPromotionVideoOne(Integer promotionVideoId) {
+ public R<PromotionVideo> getPromotionVideoOne(Long promotionVideoId) {
return R.fail("获取视频信息失败:" + cause.getMessage());
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
index 7d5d187..7b9ec22 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
@@ -3,14 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.goods.domain.pojo.GoodsSku;
import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.ruoyi.promotion.service.IPromotionVideoService;
-import com.ruoyi.system.api.domain.SysUser;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
--
Gitblit v1.7.1