合并冲突

This commit is contained in:
eli 2024-11-23 09:56:55 +08:00
parent 030f016c2d
commit eef795e2e3
2 changed files with 0 additions and 6 deletions

View File

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

View File

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