Merge branch 'zhongqi-addGoods' into dev

app-hd/controllers/BaseController.php

@@ -98,7 +98,6 @@ class BaseController extends PublicController
             $sjExtend = MerchantExtendClass::getBySjId($sjId, true);
             $this->sjExtend = $sjExtend;
         }
-        $this->formParams();
 
         return parent::beforeAction($action);
     }