From 96eac0ce567dc3eef6900ce57dcb4c029fac2082 Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期四, 16 九月 2021 16:25:17 +0800
Subject: [PATCH] 更新
---
web/Model/Model/GwClient.cs | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
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);
--
Gitblit v1.9.1