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/management/MgtAuctionGoodsController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
index f8e18fc..f27ae1a 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
@@ -1,9 +1,9 @@
package com.ruoyi.auction.controller.management;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsDTO;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsQuery;
-import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsDTO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsQuery;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -43,8 +43,8 @@
*/
@ApiOperation(value = "获取拍卖商品列表的分页数据", notes = "获取拍卖商品列表的分页数据")
@PostMapping("/page")
- public R<PageDTO<AuctionGoodsVO>> getAuctionGoodsPage(
- AuctionGoodsQuery query) {
+ public R<PageDTO<MgtAuctionGoodsVO>> getAuctionGoodsPage(
+ MgtAuctionGoodsQuery query) {
return R.ok(auctionGoodsService.getAuctionGoodsPage(query));
}
@@ -56,7 +56,7 @@
*/
@ApiOperation(value = "查看详情", notes = "查看详情")
@GetMapping("/{id}")
- public R<AuctionGoodsVO> getAuctionGoods(@PathVariable("id") Long id) {
+ public R<MgtAuctionGoodsVO> getAuctionGoods(@PathVariable("id") Long id) {
return R.ok(auctionGoodsService.getAuctionGoodsById(id));
}
@@ -67,7 +67,7 @@
*/
@ApiOperation(value = "添加/编辑 拍卖商品", notes = "添加/编辑 拍卖商品")
@PostMapping("/save")
- public R<?> saveAuctionGoods(@Validated @RequestBody AuctionGoodsDTO dto) {
+ public R<?> saveAuctionGoods(@Validated @RequestBody MgtAuctionGoodsDTO dto) {
auctionGoodsService.saveAuctionGoods(dto);
return R.ok();
}
--
Gitblit v1.7.1