Merge branch 'dev-sc-260204' of shop/php into dev

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

@@ -120,6 +120,8 @@ class Merchant extends BaseController
             if (empty($params['mer_id'])) return app('json')->fail('店铺不存在');
             $id=$this->merId = $params['mer_id'];
             $is_commercetrade = 1;
+        } else if ($name == 'sharedProsperity') {
+            $id = 3447;
         }
         [$page, $limit] = $this->getPage();
         if($params['pageNum']!=''){