merge upstream main

2026-02-02 22:13:50 +08:00
parent 7ade9baa15
commit 0170d19fa7
319 changed files with 40485 additions and 8969 deletions
@@ -14,7 +14,9 @@ export interface RedeemHistoryItem {
  status: string
  used_at: string
  created_at: string
-  // 订阅类型专用字段
+  // Notes from admin for admin_balance/admin_concurrency types
+  notes?: string
+  // Subscription-specific fields
  group_id?: number
  validity_days?: number
  group?: {