From c07167e7848867bfbf344a4d1c95ccb9df161625 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 13 Jan 2020 11:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95bug=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MemberController.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 90a27f82f..6b26217cf 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -204,6 +204,9 @@ class MemberController extends ThinkController
                 $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
                 $v['lock_status'] = get_info_status($v['lock_status'],4);
                 $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑";
+                if(get_info_status($v['lock_status'],4) != '锁定') {
+                    $v['lock_status'] = '';
+                }
                 // $data[$k] = $v;
             }