jyy
2020-12-07 65eab9d565f951e3125d6767d0400eb5abcc4d51
Merge remote-tracking branch 'origin/master'
2 files added
2 files deleted
3 files modified
5 ■■■■■ changed files
zq-erp/pom.xml 1 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipInfoImport.xls patch | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipInfoImport.zip patch | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipProjUse.xls patch | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipProjUse.zip patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html 2 ●●● patch | view | raw | blame | history
zq-erp/pom.xml
@@ -368,6 +368,7 @@
                    <include>**/*.woff</include>
                    <include>**/*.woff2</include>
                    <include>**/*.ttf</include>
                    <include>**/*.xls</include>
                </includes>
            </resource>
            <resource>
zq-erp/src/main/resources/static/templates/vipInfoImport.xls
Binary files differ
zq-erp/src/main/resources/static/templates/vipInfoImport.zip
Binary files differ
zq-erp/src/main/resources/static/templates/vipProjUse.xls
Binary files differ
zq-erp/src/main/resources/static/templates/vipProjUse.zip
Binary files differ
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>
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>