Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -139,6 +139,11 @@ namespace Hotline.Application.Mappers
                 .IgnoreIf((s, d) => s.OrderComplain == null, d => d.OrderComplain)
                 .IgnoreIf((s, d) => s.OrderReport == null, d => d.OrderReport);
 
+            config.ForType<UpdateOrderDto, Order>()
+                .Inherits<AddOrderDto, Order>()
+                .Map(d => d.OrderComplain.Id, x => x.Id)
+                .Map(d => d.OrderReport.Id, x => x.Id);
+
             #endregion
         }
     }

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -59,11 +59,11 @@ namespace Hotline.Repository.SqlSugar.Orders
             {
                 if (order.AcceptType == EAcceptType.Complain)
                 {
-                    await Db.Insertable(order.OrderComplain).ExecuteCommandAsync();
+                    await Db.Insertable<OrderComplain>(order.OrderComplain).ExecuteCommandAsync();
                 }
                 else if (order.AcceptType == EAcceptType.Report)
                 {
-                    await Db.Insertable(order.OrderReport).ExecuteCommandAsync();
+                    await Db.Insertable<OrderReport>(order.OrderReport).ExecuteCommandAsync();
                 }
                 else
                 {