From b6dd42b974a9a2fafc511acb2df3446c52fda200 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 May 2022 14:18:51 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
index eb8abf4..1d42fa1 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
@@ -106,6 +106,7 @@
                 <th data-field="total">订单总价</th>
                 <th data-field="zkTotal">折后价</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