From 309c899e53769ebcb05734f8ba3c71603899c73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 2 Sep 2025 20:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4.-=E8=81=94=E8=B0=83-=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E5=B7=A5=E4=BC=9A=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E5=85=AC=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/lang/zh-cn.php     | 2 +-
 application/api/model/Decorate.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/api/lang/zh-cn.php b/application/api/lang/zh-cn.php
index 00c4d55..ea3be00 100644
--- a/application/api/lang/zh-cn.php
+++ b/application/api/lang/zh-cn.php
@@ -108,7 +108,7 @@ return [
     '该装扮天数不存在'    => '该装扮天数不存在',
     '该个人靓号已被购买'    => '该个人靓号已被购买',
     '该房间靓号已被购买'    => '该房间靓号已被购买',
-    '该工会靓号已被购买'    => '该工会靓号已被购买',
+    '该公会靓号已被购买'    => '该公会靓号已被购买',
     '用户信息错误'    => '用户信息错误',
     '非法资金类型'    => '非法资金类型',
     '当前用户金币已达上限'     => '当前用户金币已达上限',
diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index e2bb57f..5479e8e 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -15,8 +15,8 @@ class Decorate extends Model
     // 定义时间戳字段名
     protected $createTime = 'createtime';
     protected $updateTime = 'updatetime';
-    // 定义字段类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8工会靓号
-    public $TypeArray = [1=>'头像框',2=>'坐骑',3=>'麦圈',6=>'个人靓号',7=>'房间靓号',8=>'工会靓号'];
+    // 定义字段类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号
+    public $TypeArray = [1=>'头像框',2=>'坐骑',3=>'麦圈',6=>'个人靓号',7=>'房间靓号',8=>'公会靓号'];
     protected $FromType = [1=>'购买',2=>'后台赠送',3=>'礼盒开奖',4=>'好友赠送',5=>'首充赠送',6=>'天降好礼获得',7=>'财富等级特权赠送'];
     public function __construct($data = [])
     {
@@ -150,7 +150,7 @@ class Decorate extends Model
             return ['code' => 0, 'msg' => '该房间靓号已被购买', 'data' => null];
         }
         if($decorate_info['type'] == 8 && $decorate_info['is_user_buy'] == 1){
-            return ['code' => 0, 'msg' => '该工会靓号已被购买', 'data' => null];
+            return ['code' => 0, 'msg' => '该公会靓号已被购买', 'data' => null];
         }
         $start_time = $now_time = time();
         Db::startTrans();
@@ -368,7 +368,7 @@ class Decorate extends Model
     //用户装扮详情
     /*
      * @param $id 对象id
-     * @param $type 装扮类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8工会靓号
+     * @param $type 装扮类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号
      */
     public function user_decorate_detail($id, $type){
         //根据$type 组装查询条件