From 2c481ac06298b5c464fd927893ce4c62b03c39c0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 17:46:27 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
index c1f81ad..db60893 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
@@ -95,6 +95,7 @@
                 <th  data-field="bedName">床位</th>
                 <th data-field="plsName" >配料师</th>
                 <th data-field="createStaffName">创建人</th>
+                <th data-field="cashierName">划扣人</th>
                 <th  data-field="shopName">所属门店</th>
             </tr>
             </thead>

--
Gitblit v1.9.1