Merge branch 'master' into dev

app-ghs/controllers/ProductController.php

@@ -41,7 +41,7 @@ class ProductController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $amount = $get['amount'] ?? 0;
+        $amount = $get['avCost'] ?? 0;
         $product = ProductClass::getById($id, true);
         if (empty($info)) {
             util::fail('没有找到花材');