From 78affdc74a7b86df8a1f07311741f84942ef7944 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 11 七月 2024 22:21:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 7a31365..2d39947 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -520,7 +520,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp" />
+ <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp" />
<ClCompile Include="..\project\business\Public\GroupManagerList.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -677,7 +679,15 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\start.vframe.vbusiness.cpp" />
- <ClCompile Include="..\project\total3\ViewTotalWin.cpp" />
+ <ClCompile Include="..\project\total3\FactoryPayment.cpp" />
+ <ClCompile Include="..\project\total3\GDNItem.GDN.cpp" />
+ <ClCompile Include="..\project\total3\ProductNewList.cpp" />
+ <ClCompile Include="..\project\total3\ProductNoOut.SO.cpp" />
+ <ClCompile Include="..\project\total3\viewex.total.cpp" />
+ <ClCompile Include="..\project\total3\viewex.total1.cpp" />
+ <ClCompile Include="..\project\total3\viewex.total2.cpp" />
+ <ClCompile Include="..\project\total3\ViewTotalArgWin.cpp" />
+ <ClCompile Include="..\project\total3\ViewExTotalWin.cpp" />
<ClCompile Include="..\project\tradedocument\DocFileSaveDlg.cpp" />
<ClCompile Include="..\project\tradedocument\DocSelectDlg.cpp" />
<ClCompile Include="..\project\tradedocument\HelpDocWin.cpp" />
--
Gitblit v1.9.3