Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline/Orders/Citizen.cs

@@ -1,66 +1,86 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Hotline.Share.Enums.Order;
 using SqlSugar;
+using XF.Domain.Repository;
 
 namespace Hotline.Orders
 {
-    /// <summary>
-    /// 市民，以电话号为标识
-    /// </summary>
-    public class Citizen
-    {
-        public string PhoneNumber { get; set; }
 
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string Name { get; set; }
+	[Description("市民")]
+	public class Citizen : FullStateEntity
+	{
+		/// <summary>
+		/// 电话
+		/// </summary>
+		[SugarColumn(ColumnDescription = "电话")]
+		public string PhoneNumber { get; set; }
 
-        /// <summary>
-        /// 性别
-        /// </summary>
-        public EGender Gender { get; set; }
+		/// <summary>
+		/// 姓名
+		/// </summary>
+		[SugarColumn(ColumnDescription = "姓名")]
+		public string Name { get; set; }
 
-        /// <summary>
-        /// 市民身份
-        /// </summary>
-        public EIdentityType IdentityType { get; set; }
+		/// <summary>
+		/// 性别
+		/// </summary>
+		[SugarColumn(ColumnDescription = "性别")]
+		public EGender Gender { get; set; }
+
+		/// <summary>
+		/// 市民身份
+		/// </summary>
+		[SugarColumn(ColumnDescription = "市民身份")]
+		public EIdentityType IdentityType { get; set; }
 
         /// <summary>
         /// 证件类型
         /// </summary>
-        [SugarColumn(IsNullable = true)]
-        public string? LicenceTypeCode { get; set; }
-
-        [SugarColumn(IsNullable = true)]
+        [SugarColumn(ColumnDescription = "证件类型")]
         public string? LicenceType { get; set; }
 
-        /// <summary>
-        /// 证件号码
-        /// </summary>
-        public string? LicenceNo { get; set; }
-
-        /// <summary>
-        /// 年龄段
-        /// </summary>
-        /// <summary>
-        /// 年龄段
-        /// </summary>
-        public string? AgeRangeCode { get; set; }
+		/// <summary>
+		/// 证件号码
+		/// </summary>
+		[SugarColumn(ColumnDescription = "证件号码")]
+		public string? LicenceNo { get; set; }
 
-        public string? AgeRange { get; set; }
+		/// <summary>
+		/// 年龄段
+		/// </summary>
+		[SugarColumn(ColumnDescription = "年龄段")]
+		public string? AgeRange { get; set; }
 
         /// <summary>
         /// 联系电话
         /// </summary>
-        [SugarColumn(ColumnDescription = "联系电话", IsNullable = true)]
+        [SugarColumn(ColumnDescription = "联系电话")]
         public string? Contact { get; set; }
 
-        [SugarColumn(ColumnDescription = "联系电话脱敏", IsNullable = true)]
+        [SugarColumn(ColumnDescription = "联系电话脱敏")]
         public string? ContactMask { get; set; }
-    }
+
+        /// <summary>
+        /// 市民标签
+        /// </summary>
+        [SugarColumn(ColumnDescription = "市民标签", ColumnDataType = "varchar(2000)")]
+        public string? Label { get; set; }
+
+		/// <summary>
+		/// 更新人
+		/// </summary>
+		[SugarColumn(ColumnDescription = "更新人")]
+		public string? LastModificationName { get; set; }
+
+		/// <summary>
+		/// 首次来电时间
+		/// </summary>
+		[SugarColumn(ColumnDescription = "首次来电时间")]
+		public DateTime? FirstCallTime { get; set; }
+	}
 }

src/Hotline/Orders/CitizensPortrait.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotline.Orders
-{
-	internal class CitizensPortrait
-	{
-	}
-}