From 96a23ebbcfa8e6075dba2b901d9b9d4fa2d39147 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Mon, 7 Mar 2022 20:29:16 +0800
Subject: [PATCH] fix style

---
 .../components/staff-management/staff-management.component.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
index 0ebbb778..bcf5ed41 100644
--- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
+++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
@@ -36,13 +36,9 @@ export class StaffManagementComponent implements OnInit {
     {
       title: '最后登录时间',
       index: 'lastLoginDate',
-<<<<<<< HEAD
       className: 'text-center',
-      type: 'date'
-=======
       type: 'date',
       format: item => `${item.lastLoginDate || '-'}`
->>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9
     },
     {
       title: '成员状态',