From 4e4227f9d9b0c7efc4e4afd2bb371bae9fe6cc03 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:11:10 +0800
Subject: [PATCH] 修复代理商资料无法修改问题与合并以往修改操作

---
 web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt |   70 -----------------------------------
 1 files changed, 0 insertions(+), 70 deletions(-)

diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
index 4f743b7..d135d1e 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -1,77 +1,7 @@
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\SMGW\SMGW\web\UMCLib\obj\Debug\UMCLib.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.pdb
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csprojAssemblyReference.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.dll
-F:\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\UMCLib.pdb
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csprojAssemblyReference.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.dll
-D:\Company\婧愮爜\鎺岄獜浜戝悗鍙癨web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
 D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
 D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
 D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
 D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
 D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
 D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
 D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
-<<<<<<< HEAD
-=======
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
-C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
->>>>>>> a0bd27679af9591b30aec311b2e7ad4c1ef7357d

--
Gitblit v1.9.1