From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 bfacfce..d44a34b 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
@@ -152,4 +152,16 @@
@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