解决冲突

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

@@ -1023,7 +1023,6 @@ namespace Hotline.Share.Dtos.Order
 
         public bool? IsReTransact { get; set; }
     }
->>>>>>>>> Temporary merge branch 2
 
     public class UpdateOrderDto : AddOrderDto
     {