Фикс кривого слияния
This commit is contained in:
parent
8e6ac19904
commit
5bcd0039c4
@ -141,8 +141,6 @@ namespace IceCreamShopBusinessLogic.BusinessLogics
|
||||
model.DateImplement = DateTime.Now;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
{
|
||||
model.DateImplement = order.DateImplement;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user