Merge remote-tracking branch 'origin/master'

JiangYouYao

2022-03-15 bbc374ae6a80b111bb9d3056a065d8c5f6cd143e

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html

@@ -121,6 +121,7 @@
            <th data-field="totalTime" data-sortable="true">服务时长</th>
            <th data-field="isOverTime" data-formatter="overTime">超时时间</th>
            <th data-field="createStaffName">下单顾问</th>
            <th data-field="cashierName">划扣人</th>
            <th data-field="shopName">门店</th>
            <th data-sortable="true" data-field="id" data-formatter="buidOperate">操作</th>
        </tr>