From 89b8562ad1fb3943db3ffb922544afb3ce57e457 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期一, 07 三月 2022 17:06:28 +0800
Subject: [PATCH] 待审核增加通道筛选

---
 web/Model/obj/Release/Model.csproj.FileListAbsolute.txt |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
index 6ccaa2b..baa5c80 100644
--- a/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Release/Model.csproj.FileListAbsolute.txt
@@ -47,3 +47,19 @@
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.dll
 D:\Company\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+<<<<<<< Updated upstream
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Model.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Newtonsoft.Json.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\log4net.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Oracle.DataAccess.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\bin\Release\Common.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.AssemblyReference.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.csproj.CopyComplete
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Release\Model.pdb
+=======
+>>>>>>> Stashed changes

--
Gitblit v1.9.1