Merge branch 'develop'

app/Http/Controllers/CmsContentTemplateSetController.php

@@ -88,7 +88,7 @@ class CmsContentTemplateSetController extends BaseController
             return $this->jsonError('专题ID不正确');
         }
         $product_list = $this->cmsContentSetTemplate->getProducts($request->all());
-        if (count($product_list) > 0) {
+        if ($product_list) {
             $data = [];
             $data['subject_title'] = $get_subject->title ?? '';
             $data['subject_img'] = $get_subject->subject_img ?? '';