Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -75,6 +75,7 @@ class ExtensionModuleController extends BaseController
             if($info !== false){
             if($info !== false){
                 $v['is_use'] = 1;
                 $v['is_use'] = 1;
             }
             }
+            $list[$k] = $v;
         }
         }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }

@@ -403,7 +403,7 @@ class ProductLogic extends  BaseLogic
             $cateList = $cateModel->list($status,'id',['id','pid']);
             $cateList = $cateModel->list($status,'id',['id','pid']);
             $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
             $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
             if(!empty($cateList) && ($this->param['featured_status'] != $cateModel::STATUS_ACTIVE)){
             if(!empty($cateList) && ($this->param['featured_status'] != $cateModel::STATUS_ACTIVE)){
-                $featured_ids = $cateModel->where('title', 'like', 'Featured%')->pluck('id')->toArray();
+                $featured_ids = $cateModel->where('title', 'Featured')->pluck('id')->toArray();
                 //获取当前的子集
                 //获取当前的子集
                 $featured_arr = [];
                 $featured_arr = [];
                 foreach ($featured_ids as $id){
                 foreach ($featured_ids as $id){