全部

app-ghs/controllers/PtItemClassController.php

@@ -21,7 +21,7 @@ class PtItemClassController extends BaseController
     {
         $list = PtItemClassClass::getAllByCondition([], null, 'id,name,inTurn');
         if (!empty($list)) {
-            $list = array_merge(['id' => 0, 'name' => '全部'], $list);
+            $list = array_merge([['id' => 0, 'name' => '全部']], $list);
         }
         util::success(['list' => $list]);
     }