From 396b0760eeee4f37a21cc708955cda45ca746aa5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 15:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java
index b2845da..d58113e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java
@@ -35,7 +35,7 @@
private LocalDateTime orderTime;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
- private AuctionOrderTypeEnum auctionType;
+ private AuctionOrderTypeEnum auctionOrderType;
@ApiModelProperty(value = "所属拍卖场")
private String salesroomName;
@@ -145,7 +145,7 @@
@ApiModelProperty("物流信息")
private Express100VO express100VO;
- @ApiModelProperty("是否售后 1未售后，2 售后")
+ @ApiModelProperty("是否售后 1未售后，2 售后待审核 3 售后完成")
private Integer isRequest;
}
--
Gitblit v1.7.1