From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp 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