From e9dc4cb45dc29c16c2681f53d749d1c88176b69a Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期四, 16 九月 2021 15:59:33 +0800
Subject: [PATCH] Squashed commit of the following:
---
web/Model/Model/GwClient.cs | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index c8f88a2..a6abdcc 100644
--- a/web/Model/Model/GwClient.cs
+++ b/web/Model/Model/GwClient.cs
@@ -6,9 +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;
@@ -18,11 +27,29 @@
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-涓汉
+ private string _client_Parentid; //鐖剁骇璐︽埛
+ private int _client_Type;//瀹㈡埛绫诲瀷(0-鐩村/娓犻亾銆�1-瀛愯处鎴�)
+ private int _is_Enable;//鏄惁鍚敤鐘舵��(1-鍚�/0-鍋�)
+ private Decimal _top_up_Amount_Total;//绱鍏呭��(閲戦)
+ private string _salesman;//褰掑睘涓氬姟鍛�
+
+
+
+=======
+>>>>>>> remotes/origin/Release
public int Id
{
get
@@ -179,6 +206,17 @@
}
}
+<<<<<<< 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; }
+ public int Client_Type { get => _client_Type; set => _client_Type = value; }
+ public int Is_Enable { get => _is_Enable; set => _is_Enable = value; }
+ 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