From c2b4e7c86e790d3880a8da9adeffafb3e6c12145 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 五月 2024 09:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
index 4631c2e..4bcee55 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
@@ -39,6 +39,65 @@
/// <summary>
+ /// 鐪両d
+ /// </summary>
+ [Display(Name = "鐪両d")]
+
+
+
+ public System.Int32 shengId { get; set; }
+
+
+ /// <summary>
+ /// 甯侷d
+ /// </summary>
+ [Display(Name = "甯侷d")]
+
+
+
+ public System.Int32 shiId { get; set; }
+
+
+
+ /// <summary>
+ /// 甯�
+ /// </summary>
+ [Display(Name = "甯�")]
+
+
+
+ public System.String shi { get; set; }
+
+
+ /// <summary>
+ /// 鍖哄幙Id
+ /// </summary>
+ [Display(Name = "鍖哄幙Id")]
+
+
+
+ public System.Int32 quxianId { get; set; }
+
+
+ /// <summary>
+ /// 鍖哄幙鍚嶇О
+ /// </summary>
+ [Display(Name = "鍖哄幙鍚嶇О")]
+
+
+
+ public System.String quxian { get; set; }
+
+
+ /// <summary>
+ /// 鐗囧尯
+ /// </summary>
+ [Display(Name = "鐗囧尯")]
+
+
+ public System.String pianqu { get; set; }
+
+ /// <summary>
/// 璋冩暣璁㈠崟閲戦
/// </summary>
[Display(Name = "璋冩暣璁㈠崟閲戦")]
@@ -94,7 +153,6 @@
[StringLength(maximumLength: 50, ErrorMessage = "{0}涓嶈兘瓒呰繃{1}瀛�")]
-
public System.String shipName { get; set; }
@@ -110,10 +168,17 @@
public System.String shipMobile { get; set; }
-
+
+ /// <summary>
+ /// 鏀惰揣鍦板潃
+ /// </summary>
+ [Display(Name = "鏀惰揣鍦板潃")]
+
+ [StringLength(maximumLength: 200, ErrorMessage = "{0}涓嶈兘瓒呰繃{1}瀛�")]
+
+ public System.String shouhuoAddress { get; set; }
-
@@ -148,5 +213,17 @@
/// </summary>
[SugarColumn(IsIgnore = true)]
public string statusText { get; set; }
+
+
+ /// <summary>
+ /// 宸茶姳璐归噾棰�
+ /// </summary>
+ [Display(Name = "宸茶姳璐归噾棰�")]
+
+ [Required(ErrorMessage = "璇疯緭鍏0}")]
+
+
+
+ public System.Decimal huaFeiAmount { get; set; }
}
}
--
Gitblit v1.9.1