From 16da0ad1fda1dffa3019425a6887d38ed4217f44 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 10 Jan 2021 14:26:02 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index 2a7d445..d0786df 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -18,6 +18,9 @@
@ApiModelProperty(value = "服务单Id")
private Long id;
+ @ApiModelProperty(value = "下单顾问ID")
+ private Long createStaffId;
+
@ApiModelProperty(value = "服务单编号")
private String serviceNo;
@@ -39,6 +42,14 @@
@ApiModelProperty(value = "服务项目信息")
private List<ServiceOrderListProjVo> projs;
+
+ public Long getCreateStaffId() {
+ return createStaffId;
+ }
+
+ public void setCreateStaffId(Long createStaffId) {
+ this.createStaffId = createStaffId;
+ }
public List<ServiceOrderListProjVo> getProjs() {
return projs;
@@ -123,8 +134,11 @@
case "服务单结束" :
this.status = "7";
break;
+ case "预约取消" :
+ this.status = "8";
+ break;
default:
- this.status = "1";
+ this.status = "0";
break;
}
}
--
Gitblit v1.9.1