From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 5 +----
1 files changed, 1 insertions(+), 4 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 89e31e6..6d0943e 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,13 +1,12 @@
package com.ruoyi.auction.controller.forepart;
-import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
+import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -37,7 +36,6 @@
*
*/
@PostMapping("/getVoidList")
- @ResponseBody
@ApiOperation(value = "拍卖师端-获取拍卖师端视频列表")
public R<List<PromotionVideo>> getVoidList() {
return R.ok(iAuctionVideoService.getVoidList());
@@ -46,7 +44,6 @@
@PostMapping("/addVoid")
- @ResponseBody
@ApiOperation(value = "拍卖师端-拍卖师端添加拍卖会视频播放")
public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
iAuctionVideoService.addVoid(orepartAuctionVideo);
--
Gitblit v1.7.1