Merge branch 'origin/beta' into nofxos/test

# Conflicts:
#	config/database_pg.go

web/src/types.ts

@@ -108,19 +108,16 @@ export interface AIModel {
 
 export interface Exchange {
   id: string
+  user_id: string
   name: string
   type: 'cex' | 'dex'
   enabled: boolean
-  apiKey?: string
-  secretKey?: string
   testnet?: boolean
-  // Hyperliquid 特定字段
-  hyperliquidWalletAddr?: string
-  // Aster 特定字段
-  asterUser?: string
-  asterSigner?: string
-  asterPrivateKey?: string
-  deleted?: boolean
+  hyperliquidWalletAddr?: string // 钱包地址，非敏感信息
+  asterUser?: string             // Aster用户名，非敏感信息
+  deleted: boolean
+  created_at: string
+  updated_at: string
 }
 
 export interface CreateTraderRequest {