SMGW_NewWeb.git

parent: e9dc4cb4 | 补丁 | 提交 | ignore whitespace

wzp

2021-09-16 96eac0ce567dc3eef6900ce57dcb4c029fac2082

更新

26个文件已修改

	web/.vs/Web/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Common/obj/Debug/Common.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Dao/obj/Debug/Dao.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Dao/obj/Debug/Dao.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Lib/Dao.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Lib/Dao.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Lib/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Lib/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/Model.csproj	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/Model/GwClient.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/obj/Debug/Model.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/obj/Debug/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/Model/obj/Debug/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/Bin/Dao.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/Bin/Dao.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/Bin/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/Bin/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 web/.vs/Web/v16/.suo

Binary files differ

 web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache

Binary files differ

 web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/Common/obj/Debug/Common.csproj.AssemblyReference.cache

Binary files differ

 web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache

Binary files differ

 web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache

@@ -1,5 +1 @@
<<<<<<< HEAD
d5ec7438d89fe18e3bec35b6f500682586a1659d
=======
43d05d7d9c29e436978c39f631255cf56ad1e8a9
>>>>>>> remotes/origin/Release

 web/Dao/obj/Debug/Dao.dll

Binary files differ

 web/Dao/obj/Debug/Dao.pdb

Binary files differ

 web/Lib/Dao.dll

Binary files differ

 web/Lib/Dao.pdb

Binary files differ

 web/Lib/Model.dll

Binary files differ

 web/Lib/Model.pdb

Binary files differ

 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" />

 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);

 web/Model/obj/Debug/Model.csproj.AssemblyReference.cache

Binary files differ

 web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache

@@ -1,5 +1 @@
<<<<<<< HEAD
d136e7243de12f847333601a3e3b0ceb3bb3ede8
=======
6af597a13fdb848e58fc339638f9e6f7dfd89007
>>>>>>> remotes/origin/Release

 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

 web/Model/obj/Debug/Model.dll

Binary files differ

 web/Model/obj/Debug/Model.pdb

Binary files differ

 web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache

Binary files differ

 web/web/Bin/Dao.dll

Binary files differ

 web/web/Bin/Dao.pdb

Binary files differ

 web/web/Bin/Model.dll

Binary files differ

 web/web/Bin/Model.pdb

Binary files differ

			@@ -1,5 +1 @@
			<<<<<<< HEAD
			d5ec7438d89fe18e3bec35b6f500682586a1659d
			=======
			43d05d7d9c29e436978c39f631255cf56ad1e8a9
			>>>>>>> remotes/origin/Release

			@@ -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" />

			@@ -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);

			@@ -1,5 +1 @@
			<<<<<<< HEAD
			d136e7243de12f847333601a3e3b0ceb3bb3ede8
			=======
			6af597a13fdb848e58fc339638f9e6f7dfd89007
			>>>>>>> remotes/origin/Release

			@@ -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