Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java

@@ -33,13 +33,7 @@
    @Resource
    private IAuctionGoodsService iAuctionGoodsService;

    @InnerAuth
    @PostMapping("/getAuctionGoodsOne")
    public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
        AuctionGoods auctionGoods=iAuctionGoodsService.getById(auctionSalesroomId);
        return R.ok(auctionGoods);

    }

     @PostMapping("/getAuctionGoodsList")
    @ApiOperation(value = "用户端-普通拍卖商品")