Merge remote-tracking branch 'origin/test' into test

application/model/SystemConfig.php

@@ -32,7 +32,7 @@ class SystemConfig extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getSetting(array $where = [], string $field = 'rule') : array {
+    public function getSetting( $where = [], $field = 'rule')  {
         $data =  $this->field($field)
             ->where($where)
             ->select();