From 0a5277a24bce41ca6900d4176cbe30cde55d2be6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 05 Dec 2020 22:06:10 +0800
Subject: [PATCH] Merge branch 'master' into test
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html | 2 +-
/dev/null | 0
zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html | 2 +-
zq-erp/src/main/resources/static/templates/vipInfoImport.zip | 0
zq-erp/src/main/resources/static/templates/vipProjUse.zip | 0
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/static/templates/vipInfoImport.xls b/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
deleted file mode 100644
index 1f0f4c4..0000000
--- a/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
+++ /dev/null
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipInfoImport.zip b/zq-erp/src/main/resources/static/templates/vipInfoImport.zip
new file mode 100644
index 0000000..9ec34e2
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipInfoImport.zip
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipProjUse.xls b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
deleted file mode 100644
index 426d17d..0000000
--- a/zq-erp/src/main/resources/static/templates/vipProjUse.xls
+++ /dev/null
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipProjUse.zip b/zq-erp/src/main/resources/static/templates/vipProjUse.zip
new file mode 100644
index 0000000..ed6d3b7
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipProjUse.zip
Binary files differ
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 b81c8ec..4e81bf8 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.xls";
+ window.location.href=basePath + "/templates/vipProjUse.zip";
}
</script>
</body>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
index 54e6eb3..464bbaa 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
@@ -121,7 +121,7 @@
function download() {
- window.location.href= "https://filehive2.jyymatrix.cc/uploadeFile/vipInfoImport.xls";
+ window.location.href= "https://filehive2.jyymatrix.cc/uploadeFile/vipInfoImport.zip";
}
</script>
</body>
--
Gitblit v1.9.1