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

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -269,6 +269,6 @@ public class OrderMapperConfigs : IRegister
             ;
 
         config.ForType<EarlyWarningSettingDto, EarlyWarningSetting>()
-            .Map(d => d.Id, s => s.Id);
+            .IgnoreIf((s, d) => false, d => d.Id);
     }
 }

test/Hotline.Tests/Application/OrderApplicationTest.cs

@@ -1,11 +1,13 @@
 using Hotline.Application.OrderApp;
 using Hotline.Caching.Interfaces;
+using Hotline.Early;
 using Hotline.Orders;
 using Hotline.Push.FWMessage;
 using Hotline.Push.Notifies;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using Mapster;
+using NPOI.SS.Formula.Functions;
 using Shouldly;
 using XF.Domain.Repository;
 
@@ -46,7 +48,7 @@ public class OrderApplicationTest
         visit.VisitType.ShouldBe(EVisitType.SmsVisit);
     }
 
-   
+
     [Fact]
     public async Task MapConfig_Test()
     {
@@ -55,5 +57,9 @@ public class OrderApplicationTest
         var m = data.Adapt<ReceiveMessageNotify>();
         m.NotifyDto.Name.ShouldBe(data.Name);
         m.NotifyDto.PushBusiness.ShouldBe(data.PushBusiness);
+
+        new EarlyWarningSetting { Id = "123" }.Adapt<EarlyWarningSettingDto>().Id.ShouldBe("123");
+
+        new EarlyWarningSettingDto { Id = "123" }.Adapt<EarlyWarningSetting>().Id.ShouldBe("123");
     }
 }