解决冲突

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

@@ -52,7 +52,6 @@ namespace Hotline.Share.Dtos.Order
         /// 工单状态
         /// </summary>
         public EOrderStatus? Status { get; set; }
-	}
 
         public int QueryIndex { get; set; }