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

app/controller/merchant/Common.php

@@ -74,7 +74,7 @@ class Common extends BaseController
     public function zuixinjilu()
     {
         $merId = $this->merId;
-        $merId = 476;
+        // $merId = 476;
         $pageNum = $this->request->param('pageNum') ?: 1;
         $pageSize = $this->request->param('pageSize') ?: 10;