From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html
index 95a9f36..867bbc2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.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="createTime" type="text"
+ <input autocomplete="off" name="consumeTime" type="text"
class="form-control datetimepicker"
- th:value="${#dates.format(serviceOrder.createTime, 'yyyy-MM-dd hh:mm')}"
+ th:value="${#dates.format(serviceOrder.consumeTime, 'yyyy-MM-dd hh:mm')}"
</div>
</div>
--
Gitblit v1.9.1