From fa35db7d89a358f4a6af65715f2e0a3e05f3c939 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Wed, 16 Nov 2022 17:22:28 +0800
Subject: [PATCH] 1

---
 doc/_common.py             | 6 +++++-
 webapp/models/Guild.php    | 4 +++-
 webapp/models/User.php     | 2 +-
 webapp/mt/EventRanking.php | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index 3a394677..dc6ba631 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -585,7 +585,9 @@ class GuildEx(object):
         self.fields = [
             ['guild_id', 0, '工会id'],
             ['guild_name', '', '工会名称'],
-            ['guild_badge', '', '工会头像']
+            ['guild_badge', '', '工会头像'],
+            ['owner_id', '', '会长id'],
+            ['owner_name', '', '会长名称'],
         ]
 
 class RankingItemEx(object):
@@ -995,5 +997,7 @@ class EventRankingList(object):
              ['wave', 0, '活动轮数'],
              ['themeType', 0, '1 击杀榜,2 吃鸡榜,3 场次榜,4 工会榜'],
              ['themeName', '', '活动名称'],
+             ['startTime', '', '开始时间'],
+             ['endTime', '', '结束时间'],
              ['status', 0, '0:已结束 1:进行中 2:等待中'],
         ]
diff --git a/webapp/models/Guild.php b/webapp/models/Guild.php
index ad80ad46..e129b1d9 100644
--- a/webapp/models/Guild.php
+++ b/webapp/models/Guild.php
@@ -25,7 +25,9 @@ class Guild extends BaseModel
         return array(
             'guild_id' => $row['guild_id'],
             'guild_name' => $row['guild_name'],
-            'guild_badge' => $row['guild_badge']
+            'guild_badge' => $row['guild_badge'],
+            'owner_id' => $row['guild_badge'],
+            'owner_name' => $row['owner_name'],
         );
     }
 
diff --git a/webapp/models/User.php b/webapp/models/User.php
index 086522bd..a2ba1256 100644
--- a/webapp/models/User.php
+++ b/webapp/models/User.php
@@ -105,7 +105,7 @@ class User extends BaseModel {
             'address' => phpcommon\extractOpenId($row['account_id']),
             'name' => $row['name'],
             'sex' => $row['sex'],
-            'head_id' => $row['hero_id'],
+            'head_id' => $row['head_id'],
             'head_frame' => $row['head_frame'],
             'level' => $row['level'],
             'exp' => $row['exp'],
diff --git a/webapp/mt/EventRanking.php b/webapp/mt/EventRanking.php
index 8714b382..20b45582 100644
--- a/webapp/mt/EventRanking.php
+++ b/webapp/mt/EventRanking.php
@@ -45,6 +45,8 @@ class EventRanking
             'wave' => $meta['wave'],
             'themeType' => $meta['themeType'],
             'themeName' => $meta['themeName'],
+            'startTime' => $meta['startTime'],
+            'endTime' => $meta['endTime'],
         );
         $now = myself()->_getNowTime();
         switch ($now){