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/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 4 ++++
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 7 +++++++
web/Model/Model/GwClient.cs | 16 ++++++++++++++++
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 4 ++++
4 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index e3d8de7..ae28740 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
d5ec7438d89fe18e3bec35b6f500682586a1659d
+=======
+43d05d7d9c29e436978c39f631255cf56ad1e8a9
+>>>>>>> remotes/origin/Release
diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index f67c1fc..a6abdcc 100644
--- a/web/Model/Model/GwClient.cs
+++ b/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);
diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index 10944de..c7c818b 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
d136e7243de12f847333601a3e3b0ceb3bb3ede8
+=======
+6af597a13fdb848e58fc339638f9e6f7dfd89007
+>>>>>>> remotes/origin/Release
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 114e5e9..dcf2b33 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/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
--
Gitblit v1.9.1