From 8582d93678cdc8d70636588a5929e4aa659b1243 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 13 Feb 2025 15:39:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Language.php   | 2 +-
 app/admin/model/v1/LanguageModel.php   | 6 ------
 app/common/model/LanguageBaseModel.php | 4 +---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/admin/controller/v1/Language.php b/app/admin/controller/v1/Language.php
index 4b20608f..47369943 100644
--- a/app/admin/controller/v1/Language.php
+++ b/app/admin/controller/v1/Language.php
@@ -32,7 +32,7 @@ class Language
     public function cutover()
     {
         $id = request()->param('id');
-        $language = LanguageModel::id($id)->find();
+        $language = LanguageModel::bypk($id)->find();
         if (is_null($language)) {
             return error('语言不存在');
         }
diff --git a/app/admin/model/v1/LanguageModel.php b/app/admin/model/v1/LanguageModel.php
index 60384ac3..20ab873b 100644
--- a/app/admin/model/v1/LanguageModel.php
+++ b/app/admin/model/v1/LanguageModel.php
@@ -15,10 +15,4 @@ class LanguageModel extends LanguageBaseModel
     {
         return $this->belongsTo(CountryModel::class, 'country_id', 'id');
     }
-
-    // 根据id查询
-    public function scopeId($query, $value)
-    {
-        $query->where('id', '=', $value);
-    }
 }
diff --git a/app/common/model/LanguageBaseModel.php b/app/common/model/LanguageBaseModel.php
index 859ff12c..65cc1035 100644
--- a/app/common/model/LanguageBaseModel.php
+++ b/app/common/model/LanguageBaseModel.php
@@ -3,12 +3,10 @@ declare (strict_types = 1);
 
 namespace app\common\model;
 
-use think\Model;
-
 /**
  * @mixin \think\Model
  */
-class LanguageBaseModel extends Model
+class LanguageBaseModel extends BaseModel
 {
     // 表名
     protected $name = 'sys_language';