From 83761554ac841d584e7cbce014ac5cb39e1d547f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 10:24:08 +0800
Subject: [PATCH] 1.切换OBS为天翼云 2.修改bug

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java |    9 +++++++--
 1 files changed, 7 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 1432c70..f50687b 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;
@@ -112,7 +112,7 @@
     private String receiverName;
 
     @ApiModelProperty(value = "收货人电话")
-    private String receiverphone;
+    private String receiverPhone;
 
     @ApiModelProperty(value = "城市")
     private String receiverCity;
@@ -147,4 +147,9 @@
     @ApiModelProperty("发货快递")
     private String logisticsNum;
 
+    @ApiModelProperty(value = "实际商品价格")
+    private BigDecimal sjPrice;
+    
+    @ApiModelProperty("拍卖会id")
+    private Long auctionSalesroomId;
 }

--
Gitblit v1.7.1