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/MemberOrderListVO.java | 16 ++++++++++++++++ 1 files changed, 16 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..a83ceaf 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,20 @@ @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; + + @ApiModelProperty(value = "快递单号") + @JsonInclude(JsonInclude.Include.ALWAYS) + private String courierNumber; + + @ApiModelProperty("发货快递") + private String logisticsNum; + + } -- Gitblit v1.7.1