From f9125a4024a2f13951f344e8eb00316943c7ff4c Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Mon, 7 Apr 2025 16:39:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9admin=E4=B8=AD?= =?UTF-8?q?=E5=AF=BC=E8=88=AAmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/model/v1/SysNavigationModel.php | 6 ++++++ app/common/model/SysNavigationBaseModel.php | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/admin/model/v1/SysNavigationModel.php b/app/admin/model/v1/SysNavigationModel.php index e80b7cc5..4a4b3896 100644 --- a/app/admin/model/v1/SysNavigationModel.php +++ b/app/admin/model/v1/SysNavigationModel.php @@ -4,6 +4,7 @@ declare (strict_types = 1); namespace app\admin\model\v1; use app\common\model\SysNavigationBaseModel; +use think\model\concern\SoftDelete; /** * 导航模型 @@ -11,6 +12,11 @@ use app\common\model\SysNavigationBaseModel; */ class SysNavigationModel extends SysNavigationBaseModel { + // 启用软删除 + use SoftDelete; + // 软删除字段 + protected $deleteTime = 'deleted_at'; + // 按语言查询 public function scopeLanguage($query, $value) { diff --git a/app/common/model/SysNavigationBaseModel.php b/app/common/model/SysNavigationBaseModel.php index b034fbc5..138d8784 100644 --- a/app/common/model/SysNavigationBaseModel.php +++ b/app/common/model/SysNavigationBaseModel.php @@ -3,19 +3,12 @@ declare (strict_types = 1); namespace app\common\model; -use think\model\concern\SoftDelete; - /** * 导航模型 * @mixin \think\Model */ class SysNavigationBaseModel extends BaseModel { - // 启用软删除 - use SoftDelete; - // 软删除字段 - protected $deleteTime = 'deleted_at'; - // 表名 protected $name = 'sys_navigation';