From 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 09:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
index 8657c09..aa8aed1 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs
@@ -420,6 +420,8 @@
return _ordermoney;
}
}
+
+
/// <summary>
/// 鏈�鍚庝笅鍗曟椂闂�
/// </summary>
@@ -592,6 +594,47 @@
}
#region 鎵╁睍瀛楁
+
+
+
+ #region 2021骞翠慨鏀规柊澧炲姞瀛楁锛屽湪鏈湴鏌ヨ涓嶅湪瀛樺偍杩囩▼涓疄鐜�
+ /// <summary>
+ /// 鏈笅鍗曢噾棰�
+ /// </summary>
+ public decimal? LessOrderMoneyProperty { get; set; }
+ /// <summary>
+ /// 搴旀敹娆捐鍗曟暟閲�
+ /// </summary>
+ public int? NoOverOderCount { get; set; }
+
+ /// <summary>
+ /// 鏄惁闇�瑕佹墽琛屼簡鏃ュ父缁存姢
+ /// </summary>
+ private bool? _NeedWiHu;
+
+ public bool? NeedWiHu
+ {
+ get { return _NeedWiHu; }
+ set { _NeedWiHu = value; }
+ }
+ /// <summary>
+ /// 鏄惁闇�瑕佹墽琛岃妭鏃ョ淮鎶�
+ /// </summary>
+ private bool? _JieJiaRiWiHu;
+
+ public bool? JieJiaRiWiHu
+ {
+ get { return _JieJiaRiWiHu; }
+ set { _JieJiaRiWiHu = value; }
+ }
+
+ #endregion
+
+
+
+
+
+
private string _sourcesinfoIdname;
private string _customerindustriesidname;
private string _customertypeidname;
@@ -1496,7 +1539,18 @@
this.Keyid1 = isChange ? MyConvert.ConvertToInt32(value) : Keyid1;
theValue = this.Keyid1;
}
-
+ //鏂板瀛楁NeedWiHu
+ else if ("NeedWiHu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 83)
+ {
+ this.NeedWiHu = isChange ? MyConvert.ConvertToBoolean(value) : NeedWiHu;
+ theValue = this.NeedWiHu;
+ }
+ //鏂板瀛楁JieJiaRiWiHu
+ else if ("JieJiaRiWiHu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 84)
+ {
+ this.JieJiaRiWiHu = isChange ? MyConvert.ConvertToBoolean(value) : JieJiaRiWiHu;
+ theValue = this.JieJiaRiWiHu;
+ }
return theValue;
}
--
Gitblit v1.9.1