From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
index 4e81bf8..b81c8ec 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
@@ -121,7 +121,7 @@
function download() {
- window.location.href=basePath + "/templates/vipProjUse.zip";
+ window.location.href=basePath + "/templates/vipProjUse.xls";
}
</script>
</body>
--
Gitblit v1.9.1