From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
index 72e8f44..8aa79f5 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
@@ -54,7 +54,7 @@
                 <select class="form-control" name="state" id="state">
                     <option value="">-- 请选择服务状态 --</option>
                     <option value="待预约">待预约</option>
-                    <option value="预约成功待处理">预约成功待处理</option>
+<!--                    <option value="预约成功待处理">预约成功待处理</option>-->
                     <option value="预约失败">预约失败</option>
                     <option value="预约取消">预约取消</option>
                     <option value="需配料">需配料</option>

--
Gitblit v1.9.1