From 65eab9d565f951e3125d6767d0400eb5abcc4d51 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 07 Dec 2020 07:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html | 2 +-
/dev/null | 0
zq-erp/pom.xml | 1 +
zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html | 2 +-
zq-erp/src/main/resources/static/templates/vipProjUse.xls | 0
zq-erp/src/main/resources/static/templates/vipInfoImport.xls | 0
6 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index d990fc5..4f2e0b0 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -368,6 +368,7 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
+ <include>**/*.xls</include>
</includes>
</resource>
<resource>
diff --git a/zq-erp/src/main/resources/static/templates/vipInfoImport.xls b/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
new file mode 100644
index 0000000..1f0f4c4
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
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
deleted file mode 100644
index 9ec34e2..0000000
--- a/zq-erp/src/main/resources/static/templates/vipInfoImport.zip
+++ /dev/null
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
new file mode 100644
index 0000000..46f3c7d
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
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
deleted file mode 100644
index ed6d3b7..0000000
--- a/zq-erp/src/main/resources/static/templates/vipProjUse.zip
+++ /dev/null
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 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>
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 464bbaa..54e6eb3 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.zip";
+ window.location.href= "https://filehive2.jyymatrix.cc/uploadeFile/vipInfoImport.xls";
}
</script>
</body>
--
Gitblit v1.9.1