From a88cf964159303c208d8a3a9d0b8dadef7b1388a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 10:34:45 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 5d2a8de..07ec313 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
@@ -59,16 +59,16 @@
this.status = "待预约";
break;
case "2" :
- this.status = "带配料";
+ this.status = "需配料";
break;
case "3" :
- this.status = "待服务";
+ this.status = "配料完成";
break;
case "4" :
this.status = "服务中";
break;
case "5" :
- this.status = "已完成";
+ this.status = "服务完成";
break;
default:
this.status = "";
--
Gitblit v1.9.1