Explorar el Código

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

xf hace 5 meses
padre
commit
0696a6ed8f

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -3026,7 +3026,7 @@ public class OrderController : BaseController
                 cancellationToken: HttpContext.RequestAborted);
 
             List<OrderRemarksDto> remarks = workflow.Steps.Where(x => !string.IsNullOrEmpty(x.Remark)).Select(x => new OrderRemarksDto
-            { Remark = x.Remark, RemarkTime = x.CreationTime, RemarkUser = x.CreatorName }).ToList();
+            { Remark = x.Remark, RemarkTime = x.HandleTime, RemarkUser = x.HandlerName }).ToList();
             dto.OrderRemarks = remarks;
             if (order.Status == EOrderStatus.SendBack || order.Status == EOrderStatus.SendBackAudit || order.Status == EOrderStatus.BackToUnAccept)
             {

+ 1 - 1
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -1328,7 +1328,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 备注时间
         /// </summary>
-        public DateTime RemarkTime { get; set; }
+        public DateTime? RemarkTime { get; set; }
     }
 
     public class PublishNearlyExpiredTimeSmsDto