From 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 16:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2104261..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
@@ -19,7 +19,7 @@
private Long id;
@ApiModelProperty(value = "下单顾问ID")
- private Long staffId;
+ private Long createStaffId;
@ApiModelProperty(value = "服务单编号")
private String serviceNo;
@@ -43,12 +43,12 @@
@ApiModelProperty(value = "服务项目信息")
private List<ServiceOrderListProjVo> projs;
- public Long getStaffId() {
- return staffId;
+ public Long getCreateStaffId() {
+ return createStaffId;
}
- public void setStaffId(Long staffId) {
- this.staffId = staffId;
+ public void setCreateStaffId(Long createStaffId) {
+ this.createStaffId = createStaffId;
}
public List<ServiceOrderListProjVo> getProjs() {
--
Gitblit v1.9.1