From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
index 5b2679d..1b4373e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
@@ -16,8 +16,6 @@
@ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成 ")
private String status;
- @ApiModelProperty(value = "客户视角状态 0/全部 1/待确认 2进行中（待排班/待配料/待服务/服务中） 3/待评价（已完成/服务结束） 4/已评价 5/已取消 ")
- private String vipStatus;
@ApiModelProperty(hidden = true)
private Long shopId;
@@ -28,12 +26,15 @@
@ApiModelProperty(value = "客户ID")
private Long vipId;
- public String getVipStatus() {
- return vipStatus;
+ @ApiModelProperty(hidden = true)
+ private Long companyId;
+
+ public Long getCompanyId() {
+ return companyId;
}
- public void setVipStatus(String vipStatus) {
- this.vipStatus = vipStatus;
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
}
public Long getVipId() {
--
Gitblit v1.9.1