From bbacbbede6a3c7265f165642ab19afb61bbcac8d Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 02 十二月 2024 23:31:57 +0800
Subject: [PATCH] 1202

---
 internal_system_v1/exporttofile.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/internal_system_v1/exporttofile.h b/internal_system_v1/exporttofile.h
index 5b67299..dbae261 100644
--- a/internal_system_v1/exporttofile.h
+++ b/internal_system_v1/exporttofile.h
@@ -13,7 +13,7 @@
 
 
     int saveToExcelFromComInfo(ComInfo &info); // 灏侀潰淇℃伅瀵煎嚭
-    int saveToExcelFromThreeMergePro(); // 3鍜�1瀵煎嚭
+    int saveToExcelFromThreeMergePro(QString name,QVector<ThreeMergeInfo> &threeMergeInfos); // 3鍜�1瀵煎嚭
     int saveToExcelFromNeiShenZonghe(QString name,NeiShenZongHeInfo &nszh); // 鍐呭缁煎悎瀵煎嚭
 signals:
 

--
Gitblit v1.8.0