From e62c6b670ee27f5d4e01498d4acaf14a88fcf302 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 13:17:45 +0800
Subject: [PATCH] 合并分支

---
 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
index f6be6ec..ee685a8 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt
@@ -297,7 +297,6 @@
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Newtonsoft.Json.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\AxInterop.grdes6Lib.dll
-D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXmlFormats.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\NPOI.OpenXml4Net.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\BaseSet.pdb
@@ -315,6 +314,7 @@
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WarM.dll.config
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\WorkM.pdb
 D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\M2Mqtt.Net.pdb
+D:\WorkBench\MES-WEB-API\NETERPNoWin\bin\x86\Debug\Interop.gregn6Lib.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.AssemblyReference.cache
 D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\Interop.gregn6Lib.dll
 D:\WorkBench\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.ResolveComReference.cache

--
Gitblit v1.9.1