Merge branch 'master' into dev

app-ghs/controllers/ProductController.php

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