From 6b902884b05db6d2d8ce32ca615295e8ae9003e9 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:57:22 +0800
Subject: [PATCH] 订单审校

---
 web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt |   56 ++++++++++++--------------------------------------------
 1 files changed, 12 insertions(+), 44 deletions(-)

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

--
Gitblit v1.9.1