beauty-erp.git - Gitblit

summary
reflog
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2022-05-16 781fb421fdda4aff90394777b31aea7664cc6e23

 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>

			@@ -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>