Merge branch 'develop' · d319461068 - LcShopBundle - Gitea: Git with a cup of tea

Merge branch 'develop'

master^2

Guillaume 3 years ago

parent

79b943eec7 5b1fabdb14

commit

d319461068

1 changed files with 1 additions and 1 deletions

Unified View Show Diff Stats

							
								+ 1
								
								- 1
							
ShopBundle/Model/OrderShop.phpView File
								
															        protected $merchant;
															
															        protected $merchant;
														
															        /**
															
															        /**
														
															         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface", inversedBy="orders")
															
															         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface", inversedBy="orders", fetch="EAGER")
														
															         */
															
															         */
														
															        protected $user;
															
															        protected $user;