From a4109ffda40aea56267b5f21be25c9a42c10209a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 18 十月 2024 13:56:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Expense/maint.samplefee.cpp     |    0 
 jrj/project/business/QuoteFile.cpp                   |    1 +
 jrj/project/business/Expense/maint.samplesequest.cpp |    0 
 jrj/project/business/Public/message.business.cpp     |    0 
 4 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/jrj/project/business/Expense/maint.samplefee.cpp b/jrj/project/business/Expense/maint.samplefee.cpp
index e80094d..19dd60e 100644
--- a/jrj/project/business/Expense/maint.samplefee.cpp
+++ b/jrj/project/business/Expense/maint.samplefee.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplesequest.cpp b/jrj/project/business/Expense/maint.samplesequest.cpp
index b44a836..5a70678 100644
--- a/jrj/project/business/Expense/maint.samplesequest.cpp
+++ b/jrj/project/business/Expense/maint.samplesequest.cpp
Binary files differ
diff --git a/jrj/project/business/Public/message.business.cpp b/jrj/project/business/Public/message.business.cpp
index 0677451..3b579aa 100644
--- a/jrj/project/business/Public/message.business.cpp
+++ b/jrj/project/business/Public/message.business.cpp
Binary files differ
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index f9b3d37..db00942 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -2225,6 +2225,7 @@
 		xml sheet ;
 		sheet.setNativePointer(x.CreateInstance());
 		sheet.loadXML(x.selectSingleNode(L"data/*").xml);
+		wangushendi xiuluowushen taigukuangmo
 		*/
 
 		//trace(x.xml());

--
Gitblit v1.9.3