Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-hd/goods/classes/GoodsCategoryClass.php

@@ -27,8 +27,8 @@ class GoodsCategoryClass extends BaseClass
         $mainId = $shop->mainId;
         $query = GoodsCategory::find();
         $query->where(['xhGoodsCategory.mainId' => $mainId]);
-        if (!empty($askInfo['catId']) || !empty($askInfo['categoryId'])) {
-            $cId = $askInfo['catId'] ?? 0;
+        if (!empty($askInfo['cId']) || !empty($askInfo['categoryId'])) {
+            $cId = $askInfo['cId'] ?? 0;
             if (empty($cId)) {
                 $cId = $askInfo['categoryId'] ?? 0;
             }