From c6602babed46a20a8db218bd20d566a67c51d4ed Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 六月 2024 18:12:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
index 0ba3f3c..564c45f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -149,7 +149,7 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime purchase;
- @ApiModelProperty(value = "是否售后")
+ @ApiModelProperty(value = "是否售后 1否，2 是")
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isRequest;
@@ -165,4 +165,13 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuctionBond;
+ @ApiModelProperty(value = "售后订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long requestId;
+
+ @ApiModelProperty("发货快递")
+ private String logisticsNum;
+
+
+
}
--
Gitblit v1.7.1