解决合并冲突

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -799,7 +799,7 @@ namespace Hotline.Share.Dtos.Order
                 {
                     overDays = (FiledTime - ExpiredTime).Value.Days + "天";
                 }
-				else if (FiledTime.HasValue == false && ExpiredTime < DateTime.Now)
+                else if (FiledTime.HasValue == false && ExpiredTime < DateTime.Now)
                 {
                     overDays = (DateTime.Now - ExpiredTime).Value.Days + "天";
                 }
@@ -975,10 +975,8 @@ namespace Hotline.Share.Dtos.Order
         public string? IndustryName { get; set; }
 
         #endregion
-    }
-
         public bool? IsReTransact { get; set; }
-	}
+    }
 
     public class UpdateOrderDto : AddOrderDto
     {