From 82cebded12a615637871709949b631a55109ddb5 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 11:09:03 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/PO/BigPictureView.Product3.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 3 +
jrj/ext-jrj/ext-jrj.vcxproj.filters | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+), 0 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index c268cac..acc2e81 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -707,6 +707,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\PO\business4.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index a265e45..59b6962 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -384,6 +384,66 @@
<ClInclude Include="..\xframe\devloper\XDevEditPage.cpp">
<Filter>devloper</Filter>
</ClInclude>
+ <ClInclude Include="..\jarch.impl\JStringImpl.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JByteStream.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JCharStream.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JConnect.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JDataSet.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JDataSource.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JDataStore.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JDouble.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JInt.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JObject.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JObjectSvr.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JSession.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JStream.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JString.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JWin.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JXPage.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JFactory.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JFactoryStringImpl.h">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JItemAlloc.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JPtr.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -1286,5 +1346,46 @@
<ClCompile Include="..\project\business\ProductSample\BusinessProduct3.cpp">
<Filter>project\business\ProductSample</Filter>
</ClCompile>
+ <ClCompile Include="..\jarch.impl\JStringImpl.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JFactoryStringImpl.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JItemAlloc.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JPtr.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
+ <Filter>project\business\PO</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="ext-jrj.def">
+ <Filter>婧愭枃浠�</Filter>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/PO/BigPictureView.Product3.cpp b/jrj/project/business/PO/BigPictureView.Product3.cpp
new file mode 100644
index 0000000..b8d279e
--- /dev/null
+++ b/jrj/project/business/PO/BigPictureView.Product3.cpp
Binary files differ
--
Gitblit v1.9.3