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/beautySalon/vip_bak.html | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
index 6b949bb..ae7dd75 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html
@@ -268,7 +268,6 @@
$("#userList").hide();
}
});
- updateHistory();
$("#userList").mouseleave(function () {
$(this).hide();
})
--
Gitblit v1.9.1