Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

 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>