From 7ce97a95ba44b18aa525b2c0540e5162c59d1474 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:51:50 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
index 57f3ba6..065fcc1 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
@@ -1,20 +1,11 @@
package com.ruoyi.auction.controller.forepart;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
-import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo;
-import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
-import com.ruoyi.auction.domain.pojo.AuctionVideo;
-import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.PromotionClient;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +23,7 @@
*/
@RestController
@RequestMapping("/forepart/auction-video")
+@Api(value = "拍卖会视频表相关接口", tags = "拍卖会视频表相关接口", description = "拍卖会视频表相关接口")
public class ForepartAuctionVideoController {
@@ -46,7 +38,7 @@
*/
@RequestMapping("/getVoidList")
@ResponseBody
- @ApiOperation(value = "获取拍卖师端视频列表")
+ @ApiOperation(value = "拍卖师端-获取拍卖师端视频列表")
public R<List<PromotionVideo>> getVoidList() {
return R.ok(iAuctionVideoService.getVoidList());
}
@@ -55,8 +47,8 @@
@RequestMapping("/addVoid")
@ResponseBody
- @ApiOperation(value = "拍卖师端添加拍卖会视频播放")
- public R<T> addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
+ @ApiOperation(value = "拍卖师端-拍卖师端添加拍卖会视频播放")
+ public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
iAuctionVideoService.addVoid(orepartAuctionVideo);
return R.ok();
--
Gitblit v1.7.1