From eaefb5f0d4fb5918786936dd60f4be7dd93011ba Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 12:20:30 +0800
Subject: [PATCH] Merge branch 'developer'

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
index 6fbfe73..2e0ac9b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
@@ -31,10 +31,7 @@
                 <label>客户姓名</label>
                 <input autocomplete="off"   name="vipName" id="vipName" type="text" class="form-control" >
             </div>
-            <div class="form-group mr-20">
-                <label >超时时长 > </label>
-                <input autocomplete="off"   name="isOverTime" type="text" class="form-control" placeholder="单位分钟"  id="isOverTime">
-            </div>
+
             <div class="form-group mr-20">
                 <label >所属门店</label>
                 <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
@@ -88,6 +85,7 @@
                 <th  data-field="bedName">床位</th>
                 <th data-field="plsName" >配料师</th>
                 <th data-field="createStaffName">创建人</th>
+                <th data-field="cashierName">划扣人</th>
                 <th  data-field="shopName">所属门店</th>
             </tr>
             </thead>

--
Gitblit v1.9.1