From d91d49d51503a22a424a5600b8bfa7586cf3cd91 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 21 六月 2024 20:15:46 +0800
Subject: [PATCH] 用户端商品

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index 3148705..bfacfce 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -50,7 +50,7 @@
     private OrderFromEnum orderFrom;
     
     @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
-    private AuctionOrderTypeEnum auctionType;
+    private AuctionOrderTypeEnum auctionOrderType;
 
     @ApiModelProperty(value = "会员id")
     private Long memberId;
@@ -61,7 +61,7 @@
     @ApiModelProperty(value = "支付合计")
     private BigDecimal totalAmount;
 
-    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中 7=已退款 8=已退款退货")
+    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中")
     private OrderStatusEnum orderStatus;
 
     @ApiModelProperty(value = "支付时间")

--
Gitblit v1.7.1