Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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;
@@ -36,8 +35,7 @@
     * 暖场视频or封面海报
     *
     */
    @RequestMapping("/getVoidList")
    @ResponseBody
   @PostMapping("/getVoidList")
    @ApiOperation(value = "拍卖师端-获取拍卖师端视频列表")
    public R<List<PromotionVideo>> getVoidList() {
        return R.ok(iAuctionVideoService.getVoidList());
@@ -45,8 +43,7 @@



    @RequestMapping("/addVoid")
    @ResponseBody
   @PostMapping("/addVoid")
    @ApiOperation(value = "拍卖师端-拍卖师端添加拍卖会视频播放")
    public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
        iAuctionVideoService.addVoid(orepartAuctionVideo);