From 8e2af5c93cfe23de86df7a52bc89f601a6391c11 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:22:07 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 f50687b..427c0c8 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
@@ -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 = "支付时间")
@@ -152,4 +152,15 @@
     
     @ApiModelProperty("拍卖会id")
     private Long auctionSalesroomId;
+    @ApiModelProperty("是否显示订单 1显示,2 不显示")
+    private Integer isOrder;
+
+    @ApiModelProperty("是否售后 0未售后,1 售后")
+    private Integer isRequest;
+
+    @ApiModelProperty("失效时间")
+    private LocalDateTime orderTimeSx;
+
+    @ApiModelProperty("团购编号")
+    private String groupNo;
 }

--
Gitblit v1.7.1