From bbc374ae6a80b111bb9d3056a065d8c5f6cd143e Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Tue, 15 Mar 2022 10:49:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
index 6f356c3..a5dc90e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
@@ -121,6 +121,7 @@
             <th data-field="totalTime" data-sortable="true">服务时长</th>
             <th data-field="isOverTime" data-formatter="overTime">超时时间</th>
             <th data-field="createStaffName">下单顾问</th>
+            <th data-field="cashierName">划扣人</th>
             <th data-field="shopName">门店</th>
             <th data-sortable="true" data-field="id" data-formatter="buidOperate">操作</th>
         </tr>

--
Gitblit v1.9.1