From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
index 5bc8e86..b002fc6 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
@@ -91,6 +91,7 @@
                 <th data-field="payTime" data-formatter="MGrid.getTime"
                     data-sortable="true">支付时间</th>
                 <th data-field="staffName">下单顾问</th>
+                <th data-field="cashierName">收银员</th>
                 <th data-field="cashPay">现金支付金额</th>
                 <th data-field="cardPay">卡支付金额</th>
                 <th data-field="arrears">欠款金额</th>

--
Gitblit v1.9.1