From 961b8ca44057298551291ca4d14280a0ac7bc753 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 17:50:37 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index ce8244c..8541279 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -826,7 +826,10 @@
<ClCompile Include="..\project\business\SystemSettings\BindComputer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\SystemSettings\Buglist.Developer.hxsoft_A.cpp">
+ <ClCompile Include="..\project\business\SystemSettings\Buglist.Developer.hxsoft.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\BugMaint.Developer.hxsoft.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\Data.config.cpp">
@@ -844,9 +847,6 @@
<ClCompile Include="..\project\business\SystemSettings\FlowTermSelect.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\SystemSettings\GroupManagerList_A.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\project\business\SystemSettings\level.Customer.v3.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
@@ -856,10 +856,11 @@
<ClCompile Include="..\project\business\SystemSettings\maint.Level.Customer3.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\SystemSettings\Organization_A.cpp">
+ <ClCompile Include="..\project\business\SystemSettings\Organization.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\SystemSettings\ProcessManagement_A.cpp">
+ <ClCompile Include="..\project\business\SystemSettings\OrganizationBase.cpp" />
+ <ClCompile Include="..\project\business\SystemSettings\ProcessManagement.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\Resource.select.data.config.cpp">
--
Gitblit v1.9.3