Merge branch 'sgrzexport' of http://192.168.12.182/invoice/pt into test

Conflicts: dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java
2 years ago · 88e272e8d9
parent 6cd564e7ed 730b4c2c23
commit 88e272e8d9
1 changed files with 2 additions and 1 deletions
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java
@ -97,7 +97,8 @@ public class FtpDownloadController extends AbstractController {
                if ("1".equals(serviceType)) {
                    response.setContentType(this.getContentType(fileName));
                } else {
-                    response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+                    response.setContentType("application/octet-stream");
+                    response.setContentType("application/vnd.ms-excel");
                }
                response.setHeader("Content-disposition",
                    "attachment; filename=" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1"));