From 848e08c6cef8a6d62c9c9aa40b2f0b9363f3137f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 16:03:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java |    2 +-
 1 files changed, 1 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..033babe 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -21,7 +21,7 @@
     @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)

--
Gitblit v1.9.1