правки

BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs

@@ -27,11 +27,8 @@ namespace BeautySalonDatabaseImplement.Models
         public virtual LaborCosts LaborCost { get; set; }
 
         [ForeignKey("CosmeticId")]
-<<<<<<< HEAD
-        public virtual List<ProcedureCosmetic> Procedures { get; set; } = new();
-=======
+
         public virtual List<CosmeticProcedure> Procedures { get; set; } = new();
->>>>>>> подправила заказ
 
         [ForeignKey("CosmeticId")]
         public virtual List<ServiceCosmetic> Services { get; set; } = new();

BeautySalonView/BeautySalonDatabaseImplement/Models/OrderCosmetic.cs

@@ -17,12 +17,11 @@ namespace BeautySalonDatabaseImplement.Models
         [Required]
         public int CosmeticId { get; set; }
 
-<<<<<<< HEAD
-=======
+
         [Required]
         public int OrderCosmeticCount { get; set; }
 
->>>>>>> подправила заказ
+
         public virtual Order_ Order { get; set; } = new();
 
         public virtual Cosmetic Cosmetic { get; set; } = new();

BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs

@@ -59,13 +59,8 @@ namespace BeautySalonDatabaseImplement.Models
         {
             get
             {
-<<<<<<< HEAD:BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
-                _orderCosmetics ??= Cosmetic
-                    .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel))
-=======
                 _orderCosmetics ??= Cosmetics
                     .Select(pc => new OrderCosmeticViewModel(pc.Cosmetic.GetViewModel, pc.OrderCosmeticCount))
->>>>>>> подправила заказ:BeautySalonView/BeautySalonDatabaseImplement/Models/Order.cs
                     .ToList();
                 return _orderCosmetics;
             }