From 54efbecc8727d866a8321103d10b8fe430748c08 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 25 十一月 2024 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj.filters | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index e7c9d05..1faf390 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -136,8 +136,8 @@
<Filter Include="jarch.impl">
<UniqueIdentifier>{4d691658-8fdc-4c09-8cfa-d8fa62419ef3}</UniqueIdentifier>
</Filter>
- <Filter Include="project\business\Affair">
- <UniqueIdentifier>{24c32061-a8e2-4f3a-9e5f-597e238284e4}</UniqueIdentifier>
+ <Filter Include="jarch\trap">
+ <UniqueIdentifier>{e347ddca-9ba1-4a91-81f5-a70a0f2c4378}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@@ -475,34 +475,34 @@
<Filter>xframe\xcontrol</Filter>
</ClInclude>
<ClInclude Include="JArgument.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JBinaryOp.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JField.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JLiteral.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JMethod.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JModule.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JParam.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JType.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JValue.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
<ClInclude Include="JVariant.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -1473,46 +1473,49 @@
<Filter>project\business\PO</Filter>
</ClCompile>
<ClCompile Include="JArgument.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JBinaryOp.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JField.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JLiteral.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JMethod.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JModule.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JParam.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JType.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JValue.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="JVariant.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch\trap</Filter>
</ClCompile>
<ClCompile Include="..\project\business\Affair\Business5.cpp">
- <Filter>project\business\Affair</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\business\Affair\message.business.cpp">
- <Filter>project\business\Affair</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\business\Affair\message.supplier.cpp">
- <Filter>project\business\Affair</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\business\Affair\ProcessManagement.cpp">
- <Filter>project\business\Affair</Filter>
+ <Filter>vbusiness\wface</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.samplerequest2.cpp">
+ <Filter>project\business\Expense</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3