From d397b54e3924c55e80782a80d9f19d616d40ccba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:53:40 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
index d29ab50..24cbe1f 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
@@ -15,7 +15,7 @@
@ApiModelProperty(value="客户姓名")
private String name;
- @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
+ @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
private Integer status;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
--
Gitblit v1.9.1