Merge remote-tracking branch 'origin/dev' into dev

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

@@ -22,6 +22,16 @@ 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.Application/Options/GetCamsUrlOptions.cs

@@ -1,17 +0,0 @@
-using SJZY.Expand.ABP.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Application.Options
-{
-    public class GetCamsUrlOptions : IOptionAutoInjection
-    {
-        /// <summary>
-        /// 2.5URL
-        /// </summary>
-        public string? Cams25URL {  get; set; }
-    }
-}