From a4185943b6f0c8a680b1274aa53bc2d1934f928c Mon Sep 17 00:00:00 2001
From: lifan <2308045698@qq.com>
Date: 星期二, 21 七月 2026 16:04:17 +0800
Subject: [PATCH] update

---
 jrj/project/business/GDN/Merge.GDN.cpp |    0 
 jrj/ext-jrj/ext-jrj.vcxproj            |    1 +
 jrj/ext-jrj/ext-jrj.vcxproj.filters    |    3 +++
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 9e94472..355eeb5 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -723,6 +723,7 @@
     <ClCompile Include="..\project\business\GDN\list.SOTrace3.cpp" />
     <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp" />
     <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp" />
+    <ClCompile Include="..\project\business\GDN\Merge.GDN.cpp" />
     <ClCompile Include="..\project\business\GDN\po.paper.cpp" />
     <ClCompile Include="..\project\business\GDN\select.item.po.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 72f3936..372210c 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -1655,6 +1655,9 @@
     <ClCompile Include="list.Test.ap.cpp">
       <Filter>project\business\AP</Filter>
     </ClCompile>
+    <ClCompile Include="..\project\business\GDN\Merge.GDN.cpp">
+      <Filter>project\business\GDN</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="ext-jrj.def">
diff --git a/jrj/project/business/GDN/Merge.GDN.cpp b/jrj/project/business/GDN/Merge.GDN.cpp
new file mode 100644
index 0000000..1a1a6df
--- /dev/null
+++ b/jrj/project/business/GDN/Merge.GDN.cpp
Binary files differ

--
Gitblit v1.9.3