Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/store/merchant/Merchant.php

@@ -185,6 +185,9 @@ class Merchant extends BaseController
                 $goods = $this->repository->productList($mer['mer_id'],$where, 1, 3,$this->userInfo,false,$is_commercetrade);
                 if(empty($goods['list'])) continue;
                 $mer['goods_list'] = $goods['list'];
+                if (mb_strlen($mer['mer_name']) > 8) {
+                    $mer['mer_name'] = mb_substr($mer['mer_name'], 0, 8) . '...';
+                }
                 $return_list[] = $mer;
             }
         }