From 3a3e585d9dd93688ed237bfc46bf06991d0772a1 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 19 五月 2022 15:00:52 +0800
Subject: [PATCH] 账号信息增加是否自动返还 系统账号信息增加:用户类型 客户信息增加:归属客户经理、归属业务员、归属客服人员、归属财务等 客户账号查询优化 账号查询充值优化

---
 web/Model/Model/GwClient.cs |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index a6abdcc..b701058 100644
--- a/web/Model/Model/GwClient.cs
+++ b/web/Model/Model/GwClient.cs
@@ -6,18 +6,13 @@
 
 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 +22,13 @@
         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-涓汉
@@ -45,11 +37,14 @@
         private int _is_Enable;//鏄惁鍚敤鐘舵��(1-鍚�/0-鍋�)
         private Decimal _top_up_Amount_Total;//绱鍏呭��(閲戦)
         private string _salesman;//褰掑睘涓氬姟鍛�
+        public string CustomerManager { get; set; } //褰掑睘瀹㈡埛缁忕悊
+        public string SupportStaff { get; set; } //褰掑睘瀹㈡湇浜哄憳
+        public string FinancialStaff { get; set; } //褰掑睘璐㈠姟浜哄憳
+        public int ChargeType { get; set; } //璁¤垂鏂瑰紡锛�1-棰勪粯璐癸紱2-鍚庝粯璐�.
+        public int SmsStatusReport { get; set; } //鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
+        public int MmsStatusReport { get; set; } //褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
 
 
-
-=======
->>>>>>> remotes/origin/Release
         public int Id
         {
             get
@@ -206,7 +201,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 +210,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);

--
Gitblit v1.9.1