解决冲突

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -22,16 +22,6 @@ public class GetPageTrackOrderInput : PageInfoInput
     /// </summary>
     public int TabType { get; set; }
 
-    /// <summary>
-    /// 订单类型
-    /// </summary>
-    public int? TrackOrderType { get; set; }
-
-    /// <summary>
-    /// 客户id
-    /// </summary>
-    public int? CustomerId { get; set; }
-
     ///// <summary>
     ///// 当tab选中  0 默认不传  1 直接写死传值  [1,4]  2  传  [2,4]
     ///// </summary>

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -32,16 +32,6 @@
         /// </summary>
         public List<string>? OrderNos { get; set; }
 
-        /// <summary>
-        /// 订单类型
-        /// </summary>
-        public int? TrackOrderType { get; set; }
-
-        /// <summary>
-        /// 客户id
-        /// </summary>
-        public int? CustomerId { get; set; }
-
         /// <summary>
         /// 创建时间开始
         /// </summary>