From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
index 2274287..55cf2c3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
@@ -41,17 +41,11 @@
     @ApiModelProperty(value = "拍卖场id")
     private Long auctionSalesroomId;
 
-    @ApiModelProperty(value = "商品id")
-    private Long goodsSkuId;
+    @ApiModelProperty(value = "拍卖商品id")
+    private Long salesroomGoodsId;
 
     @ApiModelProperty(value = "所属拍卖场")
     private String auctionSaleroomName;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsSkuName;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String goodsCoverPic;
 
     @ApiModelProperty(value = "创建者")
     @TableField(value = "create_by", fill = FieldFill.INSERT)

--
Gitblit v1.7.1