From 161339de222b8340d798a8596910af6351efb743 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 16 四月 2025 15:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Expense/TestExpenseImport.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 1 +
jrj/project/business/Expense/list.expense.ap.cpp | 0
jrj/project/business/Expense/maint.expense.ap.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 3 +++
5 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 7796782..87f3818 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -693,6 +693,7 @@
<ClCompile Include="..\project\business\Expense\TestExpenseBase2.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\TestExpenseImport.cpp" />
<ClCompile Include="..\project\business\Expense\VATInvoiceAdd.cpp" />
<ClCompile Include="..\project\business\Expense\VATNotityListShiftToList.cpp" />
<ClCompile Include="..\project\business\GDN3.list.cpp">
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 930edcc..becf7ab 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -1625,6 +1625,9 @@
<ClCompile Include="..\project\business\Public\ColumnTranView.cpp">
<Filter>project\business\Public</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\TestExpenseImport.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ext-jrj.def">
diff --git a/jrj/project/business/Expense/TestExpenseImport.cpp b/jrj/project/business/Expense/TestExpenseImport.cpp
new file mode 100644
index 0000000..38695fa
--- /dev/null
+++ b/jrj/project/business/Expense/TestExpenseImport.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/list.expense.ap.cpp b/jrj/project/business/Expense/list.expense.ap.cpp
index acc555a..600ec58 100644
--- a/jrj/project/business/Expense/list.expense.ap.cpp
+++ b/jrj/project/business/Expense/list.expense.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.expense.ap.cpp b/jrj/project/business/Expense/maint.expense.ap.cpp
index cc4ee62..9c6eb0e 100644
--- a/jrj/project/business/Expense/maint.expense.ap.cpp
+++ b/jrj/project/business/Expense/maint.expense.ap.cpp
Binary files differ
--
Gitblit v1.9.3