From 318d349fc009011a135dbce5a25e392b492c0718 Mon Sep 17 00:00:00 2001 From: yzh <snbbt@21cn.com> Date: 星期五, 20 五月 2022 16:49:20 +0800 Subject: [PATCH] 客户分配个性产品 系统数据权限隔离 --- web/Common/obj/Release/Common.csproj.FileListAbsolute.txt | 59 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt index cf23811..700fb04 100644 --- a/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt +++ b/web/Common/obj/Release/Common.csproj.FileListAbsolute.txt @@ -1,27 +1,32 @@ -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.pdb -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\log4net.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Oracle.DataAccess.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csprojAssemblyReference.cache -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CopyComplete -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.pdb -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csprojAssemblyReference.cache -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll -C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.AssemblyReference.cache -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll -C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb +D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.dll +D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.pdb +D:\Company\SMGW_NewWeb\web\Common\bin\Release\log4net.dll +D:\Company\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll +D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache +D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache +D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.dll +D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.pdb +<<<<<<< HEAD +<<<<<<< Updated upstream +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.dll +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.pdb +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\log4net.dll +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.dll +C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.pdb +======= +>>>>>>> Stashed changes +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Common.dll +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Common.pdb +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\log4net.dll +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.dll +C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Common\obj\Release\Common.pdb +======= +>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c -- Gitblit v1.9.1