From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 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 785ca3a..7eeaf03 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
@@ -111,6 +111,7 @@
             <th data-field="money">消耗金额</th>
             <th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">下单时间</th>
             <th data-field="yyTime" data-sortable="true" data-formatter="MGrid.getTime">预约时间</th>
+            <th data-field="consumeTime" data-sortable="true" data-formatter="MGrid.getTime">划扣时间</th>
             <th data-field="totalTime" data-sortable="true">服务时长</th>
             <th data-field="isOverTime" data-formatter="overTime">超时时间</th>
             <th data-field="createStaffName">下单顾问</th>

--
Gitblit v1.9.1