Merge branch 'Lab2_Base' into Lab2_Hard

ConfectionaryFileImplement/Order.cs

@@ -74,6 +74,7 @@ namespace ConfectioneryFileImplement.Models
         }
         public OrderViewModel GetViewModel => new()
         {
+            PastryName = DataFileSingleton.GetInstance().Pastries.FirstOrDefault(x => x.Id == PastryId)?.PastryName ?? string.Empty,
             PastryId = PastryId,
             Count = Count,
             Sum = Sum,