Merge branch 'develop'

ShopBundle/Repository/MerchantRepository.php

 
 namespace Lc\ShopBundle\Repository;
 
-use Lc\ShopBundle\Context\DefaultRepositoryInterface;
+use Doctrine\ORM\EntityRepository;
 use Lc\ShopBundle\Context\MerchantInterface;
 
 /**
  * @method MerchantInterface[]    findAll()
  * @method MerchantInterface[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class MerchantRepository extends BaseRepository implements DefaultRepositoryInterface
+class MerchantRepository extends EntityRepository
 {
+        public function findAllWithConfigs()
+        {
+                $qb = $this->createQueryBuilder('hub');
+                $qb->innerJoin('hub.merchantConfigs', 'merchant_configs');
+                return $qb->getQuery()->getResult();
+        }
+
         public function getInterfaceClass()
         {
                 return MerchantInterface::class;