From 6b902884b05db6d2d8ce32ca615295e8ae9003e9 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:57:22 +0800
Subject: [PATCH] 订单审校
---
web/web/Bin/Dao.dll | 0
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 4 ----
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Lib/Model.pdb | 0
web/Model/obj/Debug/Model.pdb | 0
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 7 +++++++
web/Dao/obj/Debug/Dao.pdb | 0
web/Lib/Dao.dll | 0
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/web/Bin/Model.pdb | 0
web/web/Bin/UMCLib.dll | 0
web/.vs/Web/v16/.suo | 0
web/Lib/Model.dll | 0
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 2 +-
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
web/web/Bin/Model.dll | 0
web/.vs/Web/config/applicationhost.config | 2 +-
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 4 ----
22 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/web/.vs/Web/config/applicationhost.config b/web/.vs/Web/config/applicationhost.config
index 3a3a971..69793a8 100644
--- a/web/.vs/Web/config/applicationhost.config
+++ b/web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@
</site>
<site name="web" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="D:\Company\SMGW_NewWeb\web\web" />
+ <virtualDirectory path="/" physicalPath="C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:60960:localhost" />
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index d4a006c..113ac3c 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index f5e894a..094ad26 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index 29568ad..732ea46 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
0544a4b948cdc93476250066129b440538ad7759
-=======
-824b8542c2793ad4f659f2bbdcf31228b48c7d47
->>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index bc7d534..33649b6 100644
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -5,3 +5,10 @@
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Lib\Dao.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index 69341d3..8f64f35 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index 639fa36..b881bfd 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d3bed3f..370c349 100644
--- a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 69341d3..8f64f35 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 639fa36..b881bfd 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 1efc845..f8609b7 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index 3507217..94b2a97 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
index f5e894a..93b4e16 100644
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index 7a65625..237ef06 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
1bacd091eedbdb18186fe1adccdde3305270d490
-=======
-fde6d962a77aae709844cba5e3ccabd0c6a77d01
->>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index cd59082..5d0455d 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -7,7 +7,6 @@
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
-D:\Company\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
@@ -16,3 +15,4 @@
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
diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll
index 1efc845..f8609b7 100644
--- a/web/Model/obj/Debug/Model.dll
+++ b/web/Model/obj/Debug/Model.dll
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
index 3507217..94b2a97 100644
--- a/web/Model/obj/Debug/Model.pdb
+++ b/web/Model/obj/Debug/Model.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 69341d3..8f64f35 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 639fa36..b881bfd 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index 1efc845..f8609b7 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index 3507217..94b2a97 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.dll b/web/web/Bin/UMCLib.dll
index 2ea71a8..de922c5 100644
--- a/web/web/Bin/UMCLib.dll
+++ b/web/web/Bin/UMCLib.dll
Binary files differ
--
Gitblit v1.9.1