Merge branch 'feature/shopName' into release/5.4

@@ -308,7 +308,7 @@ const getShopList = params => {
                 _.get(shops, 'data.shopBrandInfo.brandInfo', {});
                 _.get(shops, 'data.shopBrandInfo.brandInfo', {});
 
 
         if (_.isEmpty(shopInfo)) {
         if (_.isEmpty(shopInfo)) {
-            return shopEntry;
+            return;
         }
         }
 
 
         shopEntry = {
         shopEntry = {