소스 검색

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

tangjiang 4 주 전
부모
커밋
7e20fefa80
2개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      src/Hotline.Application/Snapshot/RedPackApplication.cs
  2. 7 0
      src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

+ 1 - 0
src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -327,6 +327,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                             County = order.County,
                             // IsRectify = s.IsRepetition
                             IsDeal = snapshot.IsDeal,
+                            IsSafetyDepartment = snapshot.IsSafetyDepartment,
                             NetworkENumber = snapshot.NetworkENumber,
                             IsTruth = snapshot.IsTruth,
                             IsTruthDepartment = snapshot.IsTruthDepartment,

+ 7 - 0
src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -466,6 +466,13 @@ public class SnapshotOrderAuditItemsOutDto
     /// 奖励人姓名
     /// </summary>
     public string? AwardName { get; set; }
+
+    /// <summary>
+    /// 标记是否安全生产
+    /// </summary>
+    public bool? IsSafetyDepartment { get; set; }
+
+    public string? IsSafetyDepartmentTxt => IsSafetyDepartment.HasValue ? (IsSafetyDepartment.Value ? "是" : "否") : string.Empty;
 }
 
 /// <summary>