适配多商户

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

@@ -57,6 +57,8 @@ export interface User {
   // 角色列表
   roles?: Role[];
   roleCode?: string;
+  roleId?: number;
+  roleName?: string;
   // 权限列表
   authorities?: Menu[];
   payTime?: string;
@@ -83,6 +85,7 @@ export interface User {
   setting?: string;
   realName?: string;
   companyName?: string;
+  merchantName?: string;
   gradeName?: string;
   idCard?: string;
   comments?: string;