From f81ae4085304f74db4454e9168af75d59496bb87 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 08:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 81b758a..00241e4 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
@@ -69,4 +69,13 @@
     @JsonInclude(JsonInclude.Include.ALWAYS)
     private ReturnRequestStatusEnum status;
 
+    @ApiModelProperty(value = "是否售后")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private Integer isRequest;
+
+    @ApiModelProperty(value = "售后订单")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private Long requestId;
+
+
 }

--
Gitblit v1.7.1