合并

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

@@ -1159,7 +1159,7 @@ namespace Hotline.Repository.SqlSugar.Orders
                     NearlyExpiredTime = x.NearlyExpiredTime,
                     SourceChannel = x.SourceChannel,
                     TransferPhone = x.TransferPhone,
-                    ActualHandleStepName = x.ActualHandleStepName,
+                    CurrentStepName = x.CurrentStepName,
                     ReTransactNum = x.ReTransactNum,
                     //甄别状态
                     OrderScreenStatus = SqlFunc.Subqueryable<OrderScreen>().Where(q=>q.OrderId == x.Id).OrderByDesc(q=>q.CreationTime).Select(q=>q.Status), //x.OrderScreens.FirstOrDefault().Status,
@@ -1170,7 +1170,7 @@ namespace Hotline.Repository.SqlSugar.Orders
                     ExpiredTime = x.ExpiredTime,
                     OrgLevelOneName = x.OrgLevelOneName,
                     OrgLevelTwoName = x.OrgLevelTwoName,
-                    ActualHandleOrgName = x.ActualHandleOrgName,
+                    CurrentHandleOrgName = x.CurrentHandleOrgName,
                     FiledTime = x.FiledTime,
                     AcceptType = x.AcceptType,
                     HotspotName = x.HotspotName,

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -967,7 +967,7 @@ public class OrderDataInventoryRep
     /// <summary>
     /// 当前节点
     /// </summary>
-    public string ActualHandleStepName { get; set; }
+    public string CurrentStepName { get; set; }
 
     /// <summary>
     /// 重办次数
@@ -1019,7 +1019,7 @@ public class OrderDataInventoryRep
     /// <summary>
     /// 接办部门
     /// </summary>
-    public string? ActualHandleOrgName { get; set; }
+    public string? CurrentHandleOrgName { get; set; }
 
 
     /// <summary>