From 96eac0ce567dc3eef6900ce57dcb4c029fac2082 Mon Sep 17 00:00:00 2001 From: wzp <2880584989@qq.com> Date: 星期四, 16 九月 2021 16:25:17 +0800 Subject: [PATCH] 更新 --- web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache | 0 web/web/Bin/Dao.dll | 0 web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 4 ---- web/Common/obj/Debug/Common.csproj.AssemblyReference.cache | 0 web/Model/obj/Debug/Model.pdb | 0 web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 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/Lib/Model.dll | 0 web/web/Bin/Dao.pdb | 0 web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 4 ---- web/Model/Model.csproj | 8 ++------ web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0 web/Lib/Model.pdb | 0 web/Dao/obj/Debug/Dao.pdb | 0 web/Model/Model/GwClient.cs | 21 ++++----------------- web/Lib/Dao.dll | 0 web/web/Bin/Model.pdb | 0 web/.vs/Web/v16/.suo | 0 web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache | 0 web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 7 ------- web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0 web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0 web/web/Bin/Model.dll | 0 web/Lib/Dao.pdb | 0 26 files changed, 6 insertions(+), 38 deletions(-) diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo index 9bac59c..5e17053 100644 --- a/web/.vs/Web/v16/.suo +++ b/web/.vs/Web/v16/.suo Binary files differ diff --git a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache index ae67f41..24004c1 100644 --- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache +++ b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache Binary files differ diff --git a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b3b47d9..a0da3a7 100644 --- a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache index 42a2a13..dc189ff 100644 --- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache +++ b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache Binary files differ diff --git a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1ecf5c3..e3ce15b 100644 --- a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache index dc839b3..f5e894a 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 ae28740..e3d8de7 100644 --- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache +++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD d5ec7438d89fe18e3bec35b6f500682586a1659d -======= -43d05d7d9c29e436978c39f631255cf56ad1e8a9 ->>>>>>> remotes/origin/Release diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll index aad0f6b..d48c65e 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 ce999ec..27feda8 100644 --- a/web/Dao/obj/Debug/Dao.pdb +++ b/web/Dao/obj/Debug/Dao.pdb Binary files differ diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll index aad0f6b..d48c65e 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 ce999ec..27feda8 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 d6dd690..48cfbe1 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 61f7186..e94e902 100644 --- a/web/Lib/Model.pdb +++ b/web/Lib/Model.pdb Binary files differ diff --git a/web/Model/Model.csproj b/web/Model/Model.csproj index 4d59d15..3f53208 100644 --- a/web/Model/Model.csproj +++ b/web/Model/Model.csproj @@ -78,12 +78,8 @@ <Compile Include="Model\SysOperationLog.cs" /> <Compile Include="PageHandler.cs" /> <Compile Include="PageContext.cs" /> - <Compile Include="MasterPageBase.cs"> - <SubType>ASPXCodeBehind</SubType> - </Compile> - <Compile Include="PageBase.cs"> - <SubType>ASPXCodeBehind</SubType> - </Compile> + <Compile Include="MasterPageBase.cs" /> + <Compile Include="PageBase.cs" /> <Compile Include="Model\GwAp.cs" /> <Compile Include="Model\SysMenu.cs" /> <Compile Include="Model\SysUserMenu.cs" /> diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs index a6abdcc..fc85397 100644 --- a/web/Model/Model/GwClient.cs +++ b/web/Model/Model/GwClient.cs @@ -6,18 +6,12 @@ namespace Model { -<<<<<<< HEAD /// <summary> /// 璐︽埛绫� /// </summary> public class GwClient : ISessionObject { - private List<string> _PermissionList = new List<string>();//鏉冮檺鍒楄〃 -======= - public class GwClient : ISessionObject - { private List<string> _PermissionList = new List<string>(); ->>>>>>> remotes/origin/Release private string _clientId; private string _clientName; private string _telephone; @@ -27,16 +21,14 @@ private string _remark; private string _password; -<<<<<<< HEAD - private string _parentId; -======= + private string _parentId;//涓婄骇ID ->>>>>>> remotes/origin/Release + private Decimal _totalAmount; private Decimal _balance; private int _id; -<<<<<<< HEAD + private int _certification_Status;//璁よ瘉鐘舵��:0-鏈璇�/1-宸茶璇� private int _client_Classes;//瀹㈡埛绫诲埆:0-浼佷笟/1-涓汉 @@ -47,9 +39,6 @@ private string _salesman;//褰掑睘涓氬姟鍛� - -======= ->>>>>>> remotes/origin/Release public int Id { get @@ -206,7 +195,7 @@ } } -<<<<<<< HEAD + public int Certification_Status { get => _certification_Status; set => _certification_Status = value; } public int Client_Classes { get => _client_Classes; set => _client_Classes = value; } public string Client_Parentid { get => _client_Parentid; set => _client_Parentid = value; } @@ -215,8 +204,6 @@ public decimal Top_up_Amount_Total { get => _top_up_Amount_Total; set => _top_up_Amount_Total = value; } public string Salesman { get => _salesman; set => _salesman = value; } -======= ->>>>>>> remotes/origin/Release public bool HasRight(string functionID) { return this._PermissionList.Contains(functionID); diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache index f7487b9..06867c9 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 c7c818b..10944de 100644 --- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache +++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD d136e7243de12f847333601a3e3b0ceb3bb3ede8 -======= -6af597a13fdb848e58fc339638f9e6f7dfd89007 ->>>>>>> remotes/origin/Release diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt index dcf2b33..b408e4a 100644 --- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt +++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt @@ -43,15 +43,8 @@ C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.pdb C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.dll C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Lib\Model.pdb -<<<<<<< HEAD -======= C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.AssemblyReference.cache ->>>>>>> remotes/origin/Release C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.dll C:\Users\mac\Desktop\Work-Archives\SMGW\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 -======= ->>>>>>> remotes/origin/Release diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll index d6dd690..48cfbe1 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 61f7186..e94e902 100644 --- a/web/Model/obj/Debug/Model.pdb +++ b/web/Model/obj/Debug/Model.pdb Binary files differ diff --git a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a4720df..6109698 100644 --- a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache index 3e04789..f60c07b 100644 --- a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache +++ b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache Binary files differ diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll index aad0f6b..d48c65e 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 ce999ec..27feda8 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 d6dd690..48cfbe1 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 61f7186..e94e902 100644 --- a/web/web/Bin/Model.pdb +++ b/web/web/Bin/Model.pdb Binary files differ -- Gitblit v1.9.1