From 318d349fc009011a135dbce5a25e392b492c0718 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 20 五月 2022 16:49:20 +0800
Subject: [PATCH] 客户分配个性产品 系统数据权限隔离

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

diff --git a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
index 539bede..a2a81d4 100644
--- a/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Release/UMCLib.csproj.FileListAbsolute.txt
@@ -1,16 +1,29 @@
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\UMCLib.pdb
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csprojAssemblyReference.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.dll
-C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\UMCLib\obj\Release\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\UMCLib.pdb
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\bin\Release\Newtonsoft.Json.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.dll
-C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Release\UMCLib.pdb
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
+D:\Company\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+<<<<<<< HEAD
+<<<<<<< Updated upstream
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
+C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+=======
+>>>>>>> Stashed changes
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\UMCLib.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\bin\Release\Newtonsoft.Json.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.AssemblyReference.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CoreCompileInputs.cache
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.csproj.CopyComplete
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.dll
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\UMCLib\obj\Release\UMCLib.pdb
+=======
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1