Merge branch 'master' into dev

app-hd/controllers/GoodsController.php

@@ -86,7 +86,6 @@ class GoodsController extends BaseController
     public function actionGetBySn()
     {
         $sn = Yii::$app->request->get('sn');
-        $sn = str_replace('#', '', $sn);
         $mainId = $this->mainId;
         $goods = GoodsClass::getByCondition(['mainId' => $mainId, 'sn' => $sn], true);
         GoodsClass::valid($goods, $this->mainId);