Merge branch 'master' into dev

app/admin/controller/content/SubjectController.php

@@ -147,6 +147,8 @@ class SubjectController extends Curd
                     'href' => $slider['href']
                 ];
             }
+        }else{
+            unset($contentConfigJson['slider']);
         }
         if (!empty($params['cate'])) {
             $contentConfigJson['cate'] = $params['cate'];