Merge remote-tracking branch 'refs/remotes/origin/merge/merge' into feat/back-to-front

# Conflicts:
#	src/config/settings.ts
#	src/services/icCoderAuthProvider.ts

src/types/api.ts

@@ -385,6 +385,96 @@ export interface ToolConfirmResponse {
   approved: boolean;
 }
 
+// ============== 用户信息 ==============
+
+/**
+ * 用户信息响应
+ * GET /system/user/getInfo
+ */
+export interface UserInfoResponse {
+  /** 响应消息 */
+  msg: string;
+  /** 响应代码 (200 表示成功) */
+  code: number;
+  /** 权限列表 */
+  permissions: string[];
+  /** 角色列表 */
+  roles: string[];
+  /** 是否默认修改密码 */
+  isDefaultModifyPwd: boolean;
+  /** 密码是否过期 */
+  isPasswordExpired: boolean;
+  /** 用户信息 */
+  user: {
+    userId: number;
+    userName: string;
+    nickName: string;
+    email?: string;
+    phonenumber?: string;
+    sex?: string;
+    avatar?: string;
+    status?: string;
+    createTime?: string;
+    loginDate?: string;
+    [key: string]: any;
+  };
+}
+
+// ============== 会员信息 ==============
+
+/**
+ * 会员单条记录
+ */
+export interface MembershipItemVO {
+  membershipId: number | null;
+  tierCode: string;
+  tierName: string;
+  tierLevel: number;
+  expireTime: string | null;
+  remainingDays: number;
+  permanent: boolean;
+  nextGrantTime: string | null;
+  lastGrantTime: string | null;
+  grantCycle: number;
+  totalGranted: number;
+  monthlyCredits: number;
+  teamSeat: boolean;
+}
+
+/**
+ * 用户会员信息
+ */
+export interface UserMembershipVO {
+  userId: number;
+  tierCode: string;
+  tierName: string;
+  tierLevel: number;
+  allowedModelCombinations: string[];
+  description?: string;
+  createdTime?: string;
+  updatedTime?: string;
+}
+
+/**
+ * 多会员信息响应
+ */
+export interface MultiMembershipVO extends UserMembershipVO {
+  displayTier?: MembershipItemVO;
+  allMemberships?: MembershipItemVO[];
+  totalMonthlyCredits?: number;
+}
+
+/**
+ * 会员信息响应
+ * GET /strangeloop/api/membership/current
+ */
+export interface MembershipResponse {
+  code: number;
+  msg?: string;
+  message?: string;
+  data?: MultiMembershipVO;
+}
+
 // ============== 辅助类型 ==============
 
 /** 后端工具名称 */