合并冲突

src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs

@@ -47,11 +47,6 @@ public class GetAvailableContentOutput
     /// </summary>
     public float? TrackTimeZone { get; set; }
 
-    /// <summary>
-    /// 轨迹发生地
-    /// </summary>
-    public string? TrackPlace { get; set; }
-
     /// <summary>
     /// 时区的值
     /// </summary>

src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs

@@ -323,7 +323,6 @@ public class TrackContentService : ApplicationService
                     TrackPlaceCityId = matchItem.TrackPlaceCityId,
                     Remarks = matchItem.Remarks,
                     TrackTimeZoneValue = matchItem.DestinationTimeZone,
-                    TrackPlace = matchItem.TrackPlace,
                 });
             matchContent.AddRange(match);
         }