From 80060571acf0c50e868bb0d7368d690d2f496745 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
index d0907cb..eab30b4 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -21,9 +21,12 @@
@ApiModelProperty(value = "搜索参数", example = "1")
private String query;
- @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
+ @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中 5-已取消")
private Integer status;
@ApiModelProperty(hidden = true)
private Long memberId;
+
+ @ApiModelProperty(value = "1-普通订单, 2-积分订单", example = "1")
+ private Integer orderType;
}
--
Gitblit v1.9.1