From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/production/service/ProductionPrintOrderService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/ProductionPrintOrderService.java b/src/main/java/com/ruoyi/production/service/ProductionPrintOrderService.java
index af9f61a..07686df 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionPrintOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionPrintOrderService.java
@@ -35,6 +35,6 @@
      * 鐢熸垚瀵煎嚭excel 鍗板埛鍗曟ā鐗�
      * @param orderId 璁㈠崟id
      */
-    void exportPrintExcelByWordId(@Nullable Long orderId);
+    byte[] exportPrintExcelByWordId(@Nullable Long orderId);
 
 }

--
Gitblit v1.9.3