From 15f115d0f5aa1312b99d79a18eb8c975118cdc80 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 05 三月 2024 12:19:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
index df6969d..e1d2549 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
@@ -1,8 +1,8 @@
/***********************************************************************
* Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: hhtp://chuanyin.com
+ * Author:
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:58
* Description: 鏆傛棤
@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
- [SugarTable("CoreCmsDistribution",TableDescription = "鍒嗛攢鍟嗚〃")]
+ [SugarTable("CoreCmsDistribution",TableDescription = "缁忛攢鍟嗚〃")]
public partial class CoreCmsDistribution
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
public CoreCmsDistribution()
{
@@ -40,10 +40,10 @@
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Int32 userId { get; set; }
/// <summary>
- /// 鍒嗛攢鍟嗗悕绉�
+ /// 缁忛攢鍟嗗悕绉�
/// </summary>
- [Display(Name = "鍒嗛攢鍟嗗悕绉�")]
- [SugarColumn(ColumnDescription = "鍒嗛攢鍟嗗悕绉�", IsNullable = true)]
+ [Display(Name = "缁忛攢鍟嗗悕绉�")]
+ [SugarColumn(ColumnDescription = "缁忛攢鍟嗗悕绉�", IsNullable = true)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String name { get; set; }
/// <summary>
@@ -64,14 +64,14 @@
/// 寰俊鍙�
/// </summary>
[Display(Name = "寰俊鍙�")]
- [SugarColumn(ColumnDescription = "寰俊鍙�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "寰俊鍙�", IsNullable = false)]
[StringLength(50, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String weixin { get; set; }
/// <summary>
/// qq鍙�
/// </summary>
[Display(Name = "qq鍙�")]
- [SugarColumn(ColumnDescription = "qq鍙�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "qq鍙�", IsNullable = false)]
[StringLength(50, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String qq { get; set; }
/// <summary>
@@ -85,21 +85,21 @@
/// 搴楅摵Logo
/// </summary>
[Display(Name = "搴楅摵Logo")]
- [SugarColumn(ColumnDescription = "搴楅摵Logo", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵Logo", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeLogo { get; set; }
/// <summary>
/// 搴楅摵Banner
/// </summary>
[Display(Name = "搴楅摵Banner")]
- [SugarColumn(ColumnDescription = "搴楅摵Banner", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵Banner", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeBanner { get; set; }
/// <summary>
/// 搴楅摵绠�浠�
/// </summary>
[Display(Name = "搴楅摵绠�浠�")]
- [SugarColumn(ColumnDescription = "搴楅摵绠�浠�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵绠�浠�", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeDesc { get; set; }
/// <summary>
@@ -135,5 +135,35 @@
[SugarColumn(ColumnDescription = "鏄惁鍒犻櫎")]
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Boolean isDelete { get; set; }
+ /********************************************* 澧炲姞瀛楁 ************************************/
+ /// <summary>
+ /// 搴楅摵鍖哄煙
+ /// </summary>
+ [Display(Name = "搴楅摵鍖哄煙")]
+ [SugarColumn(ColumnDescription = "搴楅摵鍖哄煙" , IsNullable = true)]
+ public string areaCode { get; set; }
+
+ /// <summary>
+ /// 鍦板潃璇︽儏
+ /// </summary>
+ [Display(Name = "鍦板潃璇︽儏")]
+ [SugarColumn(ColumnDescription = "鍦板潃璇︽儏")]
+ public string address { get; set; }
+
+ /// <summary>
+ /// 骞撮攢鍞
+ /// </summary>
+ [Display(Name = "骞撮攢鍞")]
+ [SugarColumn(ColumnDescription = "骞撮攢鍞")]
+ public decimal sales { get; set; } = 0;
+
+
+ /// <summary>
+ /// 鎵�灞炶涓�
+ /// </summary>
+ [Display(Name = "鎵�灞炶涓�")]
+ [SugarColumn(ColumnDescription = "鎵�灞炶涓�")]
+ public string profession { get; set; }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1