fix style

2022-03-07 20:29:16 +08:00
parent 07589c8452
commit 96a23ebbcf
1 changed files with 0 additions and 4 deletions
--- 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: '成员状态',