From 76088a1a46cbbc05fc92ad8d982b0dcb0da87cb2 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期三, 10 九月 2025 09:58:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 service-job/src/main/java/com/java110/job/export/adapt/ReportFeeWriteOrderAdapt.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeWriteOrderAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeWriteOrderAdapt.java
index fd26b3c..a1e777e 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeWriteOrderAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/ReportFeeWriteOrderAdapt.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-@Java110Cmd(serviceCode = "fee.whiteOrderReportFeeCmd")
+@Java110Cmd(serviceCode = "fee.outWhiteOrderReportFeeCmd")
 public class ReportFeeWriteOrderAdapt extends Cmd {
 
     @Autowired
@@ -57,7 +57,7 @@
                 HttpHeaders headers = new HttpHeaders();
                 headers.add("Content-Disposition", "attachment;filename=whiteOrderFeeReport.xlsx");
                 ResponseEntity<byte[]> responseEntity = new ResponseEntity<>(
-                        workbook.toByteArray(),
+//                        workbook.toByteArray(),
                         headers,
                         HttpStatus.OK
                 );

--
Gitblit v1.8.0