From 7992fcc44d231e823736fd36483bf990a28b0536 Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期五, 08 十月 2021 09:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

---
 CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index fea6baf..40a4952 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -271,6 +271,42 @@
         }
 
         /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public DateTime? chaxuntimestart
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public DateTime? chaxuntimeend
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 鍥炴瀹㈡埛
+        /// </summary>
+        public decimal? huikuankehu
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 鏈洖娆惧鎴�
+        /// </summary>
+        public decimal? weihuikuankehu
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
         /// 鏈粯娆�
         /// </summary>
         public decimal UnPayedMoney
@@ -654,9 +690,27 @@
                 this.chaxuntime = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntime;
                 theValue = this.chaxuntime;
             }
+            else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
+            {
+                this.chaxuntimestart = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimestart;
+                theValue = this.chaxuntimestart;
+            }
+            else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
+            {
+                this.chaxuntimeend = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimeend;
+                theValue = this.chaxuntimeend;
+            }
+            else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
+            {
+                this.huikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : huikuankehu;
+                theValue = this.huikuankehu;
+            }
+            else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
+            {
+                this.weihuikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : weihuikuankehu;
+                theValue = this.weihuikuankehu;
+            }
 
-
-            
 
 
 

--
Gitblit v1.9.1