From 0875ed5a9afc4f61a6b0cc55b2c95ee7706d418a Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 21 Nov 2019 11:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0->=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7->=E7=8E=A9=E5=AE=B6=E7=BB=84->=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/UserController.class.php | 9 +++------
 Application/Admin/View/User/rolelist.html             | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php
index 37a895967..14fac80d8 100644
--- a/Application/Admin/Controller/UserController.class.php
+++ b/Application/Admin/Controller/UserController.class.php
@@ -589,12 +589,9 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){
         $this->assign('list', $list);
         $this->meta_title = '角色数据';
 				
-				
-				
-				$this->m_title = '角色查询';
-				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'User/rolelist','status'=>1])->find());
-				
-				
+		$this->m_title = '角色查询';
+		$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'User/rolelist','status'=>1])->find());
+
         $this->display();
 
     }
diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html
index b087d94f0..d0adefd7d 100644
--- a/Application/Admin/View/User/rolelist.html
+++ b/Application/Admin/View/User/rolelist.html
@@ -106,13 +106,13 @@
 	<table class="">
     <thead>
         <tr>
-        <th class="">查询时间</th>
-		<th class="">玩家账号</th>
+        <th class="">创角时间</th>
+		    <th class="">玩家账号</th>
         <th class="">游戏名称</th>
         <th class="">游戏区服ID</th>
         <th class="">游戏区服</th>
         <th class="">角色ID</th>
-		<th class="">角色名</th>
+		    <th class="">角色名</th>
         <th class="">游戏等级</th>
         <th class="">所属推广员</th>
         <th class="">最后登录时间</th>