From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index fd19d96..3f03b45 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -61,9 +61,9 @@
 
     String getProcessIdByOptimizeHeatDetail(String projectId, Integer layoutId, Integer sort);
 
-    Boolean saveOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber);
+    Boolean saveOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
 
-    Boolean updateOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber);
+    Boolean updateOrderFile(String fileName,String dxfData,String orderId,Integer orderNumber,Object fileJson);
 
     Map<String,String> selectOrderFile( String orderId,Integer orderNumber);
 

--
Gitblit v1.8.0