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

This commit is contained in:
李鹏军 2024-03-11 15:48:16 +08:00
commit d88313ae53

View File

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