From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html |   13 ++++---------
 1 files changed, 4 insertions(+), 9 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..1287221 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
@@ -1,9 +1,4 @@
-
-
-
-
-
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
 <head>
 <meta charset="utf-8">
@@ -55,11 +50,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