1、右上角的登录信息改为优先显示真实姓名

2、修复已知bug

src/api/system/user/model/index.ts

@@ -2,7 +2,6 @@ import type { PageParam } from '@/api';
 import type { Role } from '../../role/model';
 import type { Menu } from '../../menu/model';
 import { Company } from '@/api/system/company/model';
-import { Merchant } from "@/api/shop/merchant/model";
 
 /**
  * 用户