From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
index 356e9f0..757a2e1 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
+import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -54,4 +56,11 @@
public R<AuctionGoodsinfoVO> getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
return R.ok(iAuctionGoodsService.getAuctionGoodsInfo(auctionGoodsListDTO));
}
+
+ @RequestMapping("/getWdAuctionSalesList")
+ @ResponseBody
+ @ApiOperation(value = "用户端-我的拍卖-我的加入了的普通拍品")
+ public R<PageDTO<AuctionGoodsListVO>> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+ return R.ok(iAuctionGoodsService.getWdAuctionSalesList(auctionGoodsListDTO));
+ }
}
--
Gitblit v1.7.1