Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-05-15 c2b4e7c86e790d3880a8da9adeffafb3e6c12145

 CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs

@@ -1,7 +1,7 @@
/***********************************************************************
 *            Project: CoreCms
 *            Project: baifenBinfa
 *        ProjectName: 百分兵法管理系统                               
 *                Web: hhtp://chuanyin.com                     
 *                Web: http://chuanyin.com                     
 *             Author:                                        
 *              Email:                               
 *         CreateTime: 2021/10/18 11:51:30
@@ -416,12 +416,7 @@
        /// 优惠券信息
        /// </summary>
        [Display(Name = "优惠券信息")]
		
        
        
        
        
        public System.String coupon  { get; set; }
      public System.String coupon  { get; set; }
        
      
        /// <summary>
@@ -554,7 +549,20 @@
        
        
        public System.DateTime? updateTime  { get; set; }
        
		




        /// <summary>
        /// 计划订单id    ALTER TABLE [CoreCmsOrder] ADD  [planorderId] [nvarchar](255) NULL;
        /// </summary>
        [Display(Name = "计划订单id")]


        [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]


        public System.String planorderId { get; set; }

    }
}