From b19813f4f558c350b2c6e8fcb821080b0c10b257 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 19:52:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 86accab..591d3b9 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
@@ -46,7 +46,7 @@
     @RequestMapping("/addVoid")
     @ResponseBody
     @ApiOperation(value = "拍卖师端添加拍卖会视频播放")
-    public R<T> addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
+    public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
         iAuctionVideoService.addVoid(orepartAuctionVideo);
         return R.ok();
 

--
Gitblit v1.7.1