Squashed commit of the following:

wzp

2021-09-16 e9dc4cb45dc29c16c2681f53d749d1c88176b69a

Squashed commit of the following:

commit 2891fe0769189be39c9634b2cbc1841dbd52d022
Author: wzp <2880584989@qq.com>
Date:   Wed Sep 1 17:19:36 2021 +0800

    新增Release

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

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

 web/Model/Model/GwClient.cs

@@ -6,12 +6,18 @@

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;
@@ -21,11 +27,16 @@
        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-个人
@@ -37,6 +48,8 @@



=======
>>>>>>> remotes/origin/Release
        public int Id
        {
            get
@@ -193,6 +206,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; }
@@ -201,6 +215,8 @@
        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.CoreCompileInputs.cache

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

 web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt

@@ -43,8 +43,15 @@
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