From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng
---
src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java | 8 +++++++-
1 files changed, 7 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 401d64d..7a900a0 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -21,6 +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