From bbb854310857eb994c107fb0b42a44121d2d09cc Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 25 七月 2024 11:27:11 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/ext-jrj/ext-jrj.vcxproj |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 3643beb..29756db 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -459,6 +459,8 @@
     <ClCompile Include="..\project\business\Customer3.maint.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\project\business\Customer\maint.Document.Customer.v3.cpp" />
+    <ClCompile Include="..\project\business\Customer\XmShare.Custumer.v3.cpp" />
     <ClCompile Include="..\project\business\Enquiry.list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -473,7 +475,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\Enquiry\Entity.Product.Select.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelect.cpp">
@@ -543,6 +545,7 @@
     <ClCompile Include="..\project\business\Expense\FreightExpenseItem.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\project\business\Expense\FreightExpenseList.cpp" />
     <ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp" />
     <ClCompile Include="..\project\business\Expense\list.expense.ap.cpp" />
     <ClCompile Include="..\project\business\Expense\list.manage.ap.cpp" />
@@ -598,6 +601,7 @@
     <ClCompile Include="..\project\business\Expense\TestExpense.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\project\business\Expense\TestExpense.GDNInvoiceno.cpp" />
     <ClCompile Include="..\project\business\Expense\TestExpenseBase.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>

--
Gitblit v1.9.3