From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect
---
zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
index 6fbfe73..df57798 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html
@@ -31,10 +31,7 @@
<label>客户姓名</label>
<input autocomplete="off" name="vipName" id="vipName" type="text" class="form-control" >
</div>
- <div class="form-group mr-20">
- <label >超时时长 > </label>
- <input autocomplete="off" name="isOverTime" type="text" class="form-control" placeholder="单位分钟" id="isOverTime">
- </div>
+
<div class="form-group mr-20">
<label >所属门店</label>
<select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
--
Gitblit v1.9.1