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

src/Hotline.Share/Dtos/Order/CitizenDto.cs

@@ -69,11 +69,11 @@ namespace Hotline.Share.Dtos.Order
 		/// 首次来电时间
 		/// </summary>
 		public DateTime? FirstCallTime { get; set; }
-		
+
 		/// <summary>
 		/// 标签记录明细
 		/// </summary>
-		List<LabelDetailAddDto> labelDetails {  get; set; }
+		List<LabelDetailAddDto> labelDetails { get; set; }
 	}
 	public class CitizenDeleteDto
 	{
@@ -192,11 +192,12 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public DateTime? FirstCallTime { get; set; }
 
-		List<LabelDetailDto> labelDetails {  get; set; }
+		List<LabelDetailDto> labelDetails { get; set; }
 
 	}
 
-	public class LabelDetailAddDto {
+	public class LabelDetailAddDto
+	{
 
 		/// <summary>
 		/// 市民id
@@ -214,7 +215,7 @@ namespace Hotline.Share.Dtos.Order
 		public string Id { get; set; }
 	}
 
-	public class LabelDetailDto: CitizenBaseDto
+	public class LabelDetailDto : CitizenBaseDto
 	{
 
 		/// <summary>
@@ -226,5 +227,23 @@ namespace Hotline.Share.Dtos.Order
 		/// 市民标签
 		/// </summary>
 		public string? Label { get; set; }
+
+		public CitizenDto Citizen { get; set; }
+
+		public string Phone => Citizen.PhoneNumber;
+	}
+	public record CitizenQueryDto : PagedKeywordRequest
+	{
+		/// <summary>
+		/// 市民id
+		/// </summary>
+		public string? CitizenId { get; set; }
+
+		/// <summary>
+		/// 市民标签
+		/// </summary>
+		public string? Label { get; set; }
+
+		public string? CreatorName { get; set; }
 	}
 }

src/Hotline/Orders/CitizenLabelDetail.cs

@@ -23,7 +23,7 @@ namespace Hotline.Orders
 		/// 市民标签
 		/// </summary>
 		[SugarColumn(ColumnDescription = "市民标签", ColumnDataType = "varchar(200)")]
-		public string? Label { get; set; }
+		public string Label { get; set; }
 
 		/// <summary>
 		/// 

src/Hotline/Permissions/EPermission.cs

@@ -1271,6 +1271,12 @@ namespace Hotline.Permissions
 		/// </summary>
 		[Display(GroupName = "CitizenLabel", Name = "删除市民标签信息记录", Description = "删除市民标签信息记录")]
 		DeleteCitizenLabel = 504007,
+
+		/// <summary>
+		/// 市民信息标签列表
+		/// </summary>
+		[Display(GroupName = "CitizenLabel", Name = "市民信息标签列表", Description = "市民信息标签列表")]
+		CitizenLabelList = 504008,
 		#endregion
 
 		#endregion