From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
index 9d7bdf9..976e611 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
@@ -55,11 +55,11 @@
<div class="form-group">
- <label class="col-sm-2 control-label">订单时间</label>
+ <label class="col-sm-2 control-label">收款时间</label>
<div class="col-sm-4">
- <input autocomplete="off" name="orderTime" type="text"
+ <input autocomplete="off" name="payTime" type="text"
class="form-control datetimepicker"
- th:value="${#dates.format(order.orderTime, 'yyyy-MM-dd hh:mm')}" />
+ th:value="${#dates.format(order.payTime, 'yyyy-MM-dd hh:mm')}" />
</div>
</div>
<br>
--
Gitblit v1.9.1