From c9c65a2277d91c0745221b8c631e704debfe6750 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 18:37:57 +0800
Subject: [PATCH] bug修改

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
index 59d3f43..5186b62 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
@@ -2,14 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
 import com.ruoyi.common.core.enums.OrderFromEnum;
 import com.ruoyi.common.core.enums.OrderStatusEnum;
 import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import lombok.Data;
 
 @Data
 public class MemberOrderListVO {
@@ -50,7 +50,7 @@
     private OrderStatusEnum orderStatus;
 
 
-    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单 5=心愿求购")
     @JsonInclude(JsonInclude.Include.ALWAYS)
     private OrderFromEnum orderFrom;
 
@@ -116,5 +116,18 @@
     @JsonInclude(JsonInclude.Include.ALWAYS)
     private LocalDateTime receiveTime;
 
+    @ApiModelProperty(value = "单位")
+    private String unit;
 
+    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+    private AuctionOrderTypeEnum auctionOrderType;
+
+    @ApiModelProperty(value = "规格")
+    private String spec;
+
+    @ApiModelProperty(value = "规格单位")
+    private String specUnit;
+    
+    @ApiModelProperty("普通商品id")
+    private Long goodsId;
 }

--
Gitblit v1.7.1