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

src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs

@@ -0,0 +1,17 @@
+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; }
+    }
+}

src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs

@@ -73,6 +73,11 @@ namespace SJZY.Track.Application.Services.TrackOrders
                         a.IsCanDelete=trackContent.IsCanDelete;
                         a.IsExternal = trackContent.IsExternal;
                     }
+                    //else
+                    //{
+                    //    a.IsCanDelete=false;
+                    //    a.IsExternal=false;
+                    //}
                     if (a.TrackTimeZoneValue==0f)
                     {
                         a.TrackTimeZone=$"GTM{" "}+00:00";

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

@@ -97,7 +97,7 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// <summary>
         /// 客户id
         /// </summary>
-        public int CustomerId {  get; set; }
+        public int CustomerId { get; set; }
 
         ///// <summary>
         ///// 订单明细（json）