修正软删除定义

src/Model.php

@@ -136,6 +136,13 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
      */
     protected $lazyFields = [];
 
+    /**
+     * 软删除字段默认值
+     *
+     * @var mixed
+     */
+    protected $defaultSoftDelete;
+
     /**
      * Db对象
      *

src/model/concern/SoftDelete.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <[email protected]>
 // +----------------------------------------------------------------------
-declare(strict_types=1);
+declare (strict_types = 1);
 
 namespace think\model\concern;
 
@@ -26,13 +26,6 @@
  */
 trait SoftDelete
 {
-    /**
-     * 软删除字段默认值
-     *
-     * @var mixed
-     */
-    protected $defaultSoftDelete;
-
     public function db($scope = []): Query
     {
         $query = parent::db($scope);
@@ -92,7 +85,7 @@ public function delete(): bool
             return false;
         }
 
-        $name = $this->getDeleteTimeField();
+        $name  = $this->getDeleteTimeField();
         $force = $this->isForce();
 
         if ($name && !$force) {
@@ -152,7 +145,7 @@ public static function destroy($data, bool $force = false): bool
             $query->where($data);
             $data = [];
         } elseif ($data instanceof \Closure) {
-            call_user_func_array($data, [&$query]);
+            call_user_func_array($data, [ &$query]);
             $data = [];
         }
 
@@ -206,7 +199,7 @@ public function restore(array $where = []): bool
      *
      * @return string|false
      */
-    public function getDeleteTimeField(bool $read = false): bool|string
+    public function getDeleteTimeField(bool $read = false): bool | string
     {
         $field = property_exists($this, 'deleteTime') && isset($this->deleteTime) ? $this->deleteTime : 'delete_time';