From 910ca2f0f8594a1353f822d653c88a7924902217 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 19:32:18 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
index 913648e..e0cafe7 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderListDto.java
@@ -15,8 +15,12 @@
@ApiModelProperty(value="每页显示记录数")
private int pageSize=10;
- @ApiModelProperty(value = "状态 1-新任务 2-服务中 3-待入库 4-已完成")
+ @ApiModelProperty(value = "状态 用户:1-待接单 2-服务中 3-已完成 5-已取消 集物员：1-新任务 2-服务中 3-待入库 4-已完成")
private Integer status;
+ @ApiModelProperty(value = "1-用户 2-集物员")
+ private Integer type;
+ @ApiModelProperty(hidden = true)
+ private String userId;
}
--
Gitblit v1.9.1