Merge branch 'release/5.6' into release/security

@@ -26,7 +26,7 @@ const shop = (shopId, req, res, next, brandInfo) => {
         let pjax = params._pjax;
 
         // 获取不到店铺信息跳转至首页
-        if (!shopInfo.data || _.isEmpty(shopInfo.data)) {
+        if (!shopInfo || _.isEmpty(shopInfo)) {
             return res.redirect(helpers.urlFormat('', null, ''));
         }