From e05f7cc8755eb7f5525e6bf86a7e5454a0c91fd0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 0f8f17c..7d78754 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -216,6 +216,7 @@
<ClInclude Include="..\xframe\kobject\kwin.hpp" />
<ClInclude Include="..\xframe\kobject\kxaserver.hpp" />
<ClInclude Include="..\xframe\kobject\kxml.hpp" />
+ <ClInclude Include="..\xframe\kobject\kxsedit.hpp" />
<ClInclude Include="..\xframe\platform\nmemory.hpp" />
<ClInclude Include="..\xframe\platform\nstring.hpp" />
<ClInclude Include="..\xframe\system\base.hpp" />
@@ -263,6 +264,7 @@
<ClInclude Include="..\xframe\xcontrol\xlistview.hpp" />
<ClInclude Include="..\xframe\xcontrol\xoffice.hpp" />
<ClInclude Include="..\xframe\xcontrol\xreport.hpp" />
+ <ClInclude Include="..\xframe\xcontrol\xsedit.hpp" />
<ClInclude Include="..\xframe\xcontrol\xshtml.hpp" />
<ClInclude Include="..\xframe\xcontrol\xtreeview.hpp" />
<ClInclude Include="framework.h" />
@@ -597,6 +599,7 @@
<ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.Test.v3.cpp" />
<ClCompile Include="..\project\business\Expense\maint.expense.ap.cpp" />
<ClCompile Include="..\project\business\Expense\maint.salaryslip.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -881,6 +884,7 @@
<ClCompile Include="..\project\business\Quote\QuoteFilePurch.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteFilePurch2Select.cpp" />
<ClCompile Include="..\project\business\Quote\QuoteFilePurched.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -1133,6 +1137,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\xframe\devloper\devloper.cpp" />
+ <ClCompile Include="..\xframe\devloper\sqlwatch.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\xframe\devloper\XDevItemDlg.cpp" />
<ClCompile Include="..\xframe\src\nmemory.cpp" />
<ClCompile Include="..\xframe\src\nstring.cpp" />
--
Gitblit v1.9.3