From c2d1bf9ae2cde17fb0b23a0b4453792bc85d1196 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Thu, 27 Oct 2022 13:49:05 +0800
Subject: [PATCH] 1

---
 doc/_common.py         | 10 ++++++----
 webapp/models/User.php | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index 6e3296de..f7fe0bb5 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -146,8 +146,9 @@ class UserInfo(object):
             ['!hero_list', [0], '拥有的立绘背景列表'],
             ['!head_frame_list', [0], '拥有的头像框列表'],
             ['is_gain_item', 0, '0 为获取，1 以获取'],
-            ['labor_id', 0, '工会id'],
-            ['labor_name', '', '工会名称'],
+            ['guild_id', '', '工会id'],
+            ['guild_job', 0, '工会职位'],
+            ['guild_name', '', '工会名称'],
         ]
 
 class UserSimple(object):
@@ -199,8 +200,9 @@ class UserDetailInfo(object):
             ['current_rank_score', 0, '当前赛季排位分'],
             ['history_best_rank_score', 0, '历史最高赛季排位分'],
             ['like_count', 0, '点赞次数'],
-            ['labor_id', 0, '工会id'],
-            ['labor_name', '', '工会名称'],
+            ['guild_id', '', '工会id'],
+            ['guild_job', 0, '工会职位'],
+            ['guild_name', '', '工会名称'],
             ['!history_seasons', [UserHisSeason()], '历史打过的赛季列表'],
         ]
 
diff --git a/webapp/models/User.php b/webapp/models/User.php
index dd16a2ab..f17efd19 100644
--- a/webapp/models/User.php
+++ b/webapp/models/User.php
@@ -52,8 +52,9 @@ class User extends BaseModel {
             'hero_list' => self::exportHeadList($row)['hero_list'],
             'head_frame_list' => emptyReplace(json_decode($row['head_frame_list'], true), array()),
             'is_gain_item' => $row['is_gain_item'],
-            'labor_id' => $row['labor_id'],
-            'labor_name' => $row['labor_name'],
+            'guild_id' => $row['guild_id'],
+            'guild_job' => $row['guild_job'],
+            'guild_name' => $row['guild_name'],
         );
     }
 
@@ -88,8 +89,9 @@ class User extends BaseModel {
             'head_frame_list' => emptyReplace(json_decode($row['head_frame_list'], true), array()),
             'is_gain_item' => $row['is_gain_item'],
             'is_leader' => 0,
-            'labor_id' => $row['labor_id'],
-            'labor_name' => $row['labor_name'],
+            'guild_id' => $row['guild_id'],
+            'guild_job' => $row['guild_job'],
+            'guild_name' => $row['guild_name'],
         );
     }